Skip to content

Commit 05ab8f2

Browse files
miniplidavem330
authored andcommitted
filter: prevent nla extensions to peek beyond the end of the message
The BPF_S_ANC_NLATTR and BPF_S_ANC_NLATTR_NEST extensions fail to check for a minimal message length before testing the supplied offset to be within the bounds of the message. This allows the subtraction of the nla header to underflow and therefore -- as the data type is unsigned -- allowing far to big offset and length values for the search of the netlink attribute. The remainder calculation for the BPF_S_ANC_NLATTR_NEST extension is also wrong. It has the minuend and subtrahend mixed up, therefore calculates a huge length value, allowing to overrun the end of the message while looking for the netlink attribute. The following three BPF snippets will trigger the bugs when attached to a UNIX datagram socket and parsing a message with length 1, 2 or 3. ,-[ PoC for missing size check in BPF_S_ANC_NLATTR ]-- | ld #0x87654321 | ldx #42 | ld #nla | ret a `--- ,-[ PoC for the same bug in BPF_S_ANC_NLATTR_NEST ]-- | ld #0x87654321 | ldx #42 | ld #nlan | ret a `--- ,-[ PoC for wrong remainder calculation in BPF_S_ANC_NLATTR_NEST ]-- | ; (needs a fake netlink header at offset 0) | ld #0 | ldx #42 | ld #nlan | ret a `--- Fix the first issue by ensuring the message length fulfills the minimal size constrains of a nla header. Fix the second bug by getting the math for the remainder calculation right. Fixes: 4738c1d ("[SKFILTER]: Add SKF_ADF_NLATTR instruction") Fixes: d214c75 ("filter: add SKF_AD_NLATTR_NEST to look for nested..") Cc: Patrick McHardy <kaber@trash.net> Cc: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Mathias Krause <minipli@googlemail.com> Acked-by: Daniel Borkmann <dborkman@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 9114615 commit 05ab8f2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

Diff for: net/core/filter.c

+7-1
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ static u64 __skb_get_nlattr(u64 ctx, u64 A, u64 X, u64 r4, u64 r5)
600600
if (skb_is_nonlinear(skb))
601601
return 0;
602602

603+
if (skb->len < sizeof(struct nlattr))
604+
return 0;
605+
603606
if (A > skb->len - sizeof(struct nlattr))
604607
return 0;
605608

@@ -618,11 +621,14 @@ static u64 __skb_get_nlattr_nest(u64 ctx, u64 A, u64 X, u64 r4, u64 r5)
618621
if (skb_is_nonlinear(skb))
619622
return 0;
620623

624+
if (skb->len < sizeof(struct nlattr))
625+
return 0;
626+
621627
if (A > skb->len - sizeof(struct nlattr))
622628
return 0;
623629

624630
nla = (struct nlattr *) &skb->data[A];
625-
if (nla->nla_len > A - skb->len)
631+
if (nla->nla_len > skb->len - A)
626632
return 0;
627633

628634
nla = nla_find_nested(nla, X);

0 commit comments

Comments
 (0)