| Message ID | 85e04e1e6367f19c8f538d145b32f5bb93788d8a.1615199056.git.bnemeth@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: prevent infinite loop caused by incorrect proto from virtio_net_hdr_set_proto | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 1 maintainers not CCed: kuba@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Mon, Mar 8, 2021 at 5:32 AM Balazs Nemeth <bnemeth@redhat.com> wrote: > > A packet with skb_inner_network_header(skb) == skb_network_header(skb) > and ETH_P_MPLS_UC will prevent mpls_gso_segment from pulling any headers > from the packet. Subsequently, the call to skb_mac_gso_segment will > again call mpls_gso_segment with the same packet leading to an infinite > loop. > > Signed-off-by: Balazs Nemeth <bnemeth@redhat.com> > --- > net/mpls/mpls_gso.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c > index b1690149b6fa..cc1b6457fc93 100644 > --- a/net/mpls/mpls_gso.c > +++ b/net/mpls/mpls_gso.c > @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb, > > skb_reset_network_header(skb); > mpls_hlen = skb_inner_network_header(skb) - skb_network_header(skb); > - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) > + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, mpls_hlen))) > goto out; Good cathc. Besides length zero, this can be more strict: a label is 4B, so mpls_hlen needs to be >= 4B. Perhaps even aligned to 4B, too, but not if there may be other encap on top. Unfortunately there is no struct or type definition that we can use a sizeof instead of open coding the raw constant.
On 3/8/21 9:07 AM, Willem de Bruijn wrote: >> diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c >> index b1690149b6fa..cc1b6457fc93 100644 >> --- a/net/mpls/mpls_gso.c >> +++ b/net/mpls/mpls_gso.c >> @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb, >> >> skb_reset_network_header(skb); >> mpls_hlen = skb_inner_network_header(skb) - skb_network_header(skb); >> - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) >> + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, mpls_hlen))) >> goto out; > > Good cathc. Besides length zero, this can be more strict: a label is > 4B, so mpls_hlen needs to be >= 4B. > > Perhaps even aligned to 4B, too, but not if there may be other encap on top. > > Unfortunately there is no struct or type definition that we can use a > sizeof instead of open coding the raw constant. > MPLS_HLEN can be used here.
On Mon, 2021-03-08 at 09:17 -0700, David Ahern wrote: > On 3/8/21 9:07 AM, Willem de Bruijn wrote: > > > diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c > > > index b1690149b6fa..cc1b6457fc93 100644 > > > --- a/net/mpls/mpls_gso.c > > > +++ b/net/mpls/mpls_gso.c > > > @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct > > > sk_buff *skb, > > > > > > skb_reset_network_header(skb); > > > mpls_hlen = skb_inner_network_header(skb) - > > > skb_network_header(skb); > > > - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) > > > + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, > > > mpls_hlen))) > > > goto out; > > > > Good cathc. Besides length zero, this can be more strict: a label > > is > > 4B, so mpls_hlen needs to be >= 4B. > > > > Perhaps even aligned to 4B, too, but not if there may be other > > encap on top. > > > > Unfortunately there is no struct or type definition that we can use > > a > > sizeof instead of open coding the raw constant. > > > > MPLS_HLEN can be used here. > What about sizeof(struct mpls_label), like in net/ipv4/tunnel4.c?
On 3/8/21 9:26 AM, Balazs Nemeth wrote: > On Mon, 2021-03-08 at 09:17 -0700, David Ahern wrote: >> On 3/8/21 9:07 AM, Willem de Bruijn wrote: >>>> diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c >>>> index b1690149b6fa..cc1b6457fc93 100644 >>>> --- a/net/mpls/mpls_gso.c >>>> +++ b/net/mpls/mpls_gso.c >>>> @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct >>>> sk_buff *skb, >>>> >>>> skb_reset_network_header(skb); >>>> mpls_hlen = skb_inner_network_header(skb) - >>>> skb_network_header(skb); >>>> - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) >>>> + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, >>>> mpls_hlen))) >>>> goto out; >>> >>> Good cathc. Besides length zero, this can be more strict: a label >>> is >>> 4B, so mpls_hlen needs to be >= 4B. >>> >>> Perhaps even aligned to 4B, too, but not if there may be other >>> encap on top. >>> >>> Unfortunately there is no struct or type definition that we can use >>> a >>> sizeof instead of open coding the raw constant. >>> >> >> MPLS_HLEN can be used here. >> > > What about sizeof(struct mpls_label), like in net/ipv4/tunnel4.c? > I was thinking MPLS_HLEN because of its consistent use with skb manipulations. net/mpls code uses mpls_shim_hdr over mpls_label. Looks like the MPLS code could use some cleanups to make this consistent.
On Mon, Mar 8, 2021 at 11:43 AM David Ahern <dsahern@gmail.com> wrote: > > On 3/8/21 9:26 AM, Balazs Nemeth wrote: > > On Mon, 2021-03-08 at 09:17 -0700, David Ahern wrote: > >> On 3/8/21 9:07 AM, Willem de Bruijn wrote: > >>>> diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c > >>>> index b1690149b6fa..cc1b6457fc93 100644 > >>>> --- a/net/mpls/mpls_gso.c > >>>> +++ b/net/mpls/mpls_gso.c > >>>> @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct > >>>> sk_buff *skb, > >>>> > >>>> skb_reset_network_header(skb); > >>>> mpls_hlen = skb_inner_network_header(skb) - > >>>> skb_network_header(skb); > >>>> - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) > >>>> + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, > >>>> mpls_hlen))) > >>>> goto out; > >>> > >>> Good cathc. Besides length zero, this can be more strict: a label > >>> is > >>> 4B, so mpls_hlen needs to be >= 4B. > >>> > >>> Perhaps even aligned to 4B, too, but not if there may be other > >>> encap on top. On second thought, since mpls_gso_segment pulls all these headers, it is correct to require it to be a multiple of MPLS_HLEN.
diff --git a/net/mpls/mpls_gso.c b/net/mpls/mpls_gso.c index b1690149b6fa..cc1b6457fc93 100644 --- a/net/mpls/mpls_gso.c +++ b/net/mpls/mpls_gso.c @@ -27,7 +27,7 @@ static struct sk_buff *mpls_gso_segment(struct sk_buff *skb, skb_reset_network_header(skb); mpls_hlen = skb_inner_network_header(skb) - skb_network_header(skb); - if (unlikely(!pskb_may_pull(skb, mpls_hlen))) + if (unlikely(!mpls_hlen || !pskb_may_pull(skb, mpls_hlen))) goto out; /* Setup inner SKB. */
A packet with skb_inner_network_header(skb) == skb_network_header(skb) and ETH_P_MPLS_UC will prevent mpls_gso_segment from pulling any headers from the packet. Subsequently, the call to skb_mac_gso_segment will again call mpls_gso_segment with the same packet leading to an infinite loop. Signed-off-by: Balazs Nemeth <bnemeth@redhat.com> --- net/mpls/mpls_gso.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)