filter: add SKF_AD_NLATTR_NEST to look for nested attributes
Subsystems (6)
Pablo Neira Ayuso
maintainerPATCH 1/1 filter: add SKF_AD_NLATTR_NEST to look for nested attributes
SKF_AD_NLATTR allows us to find the first matching attribute in a stream of netlink attributes from one offset to the end of the netlink message. This is not suitable to look for a specific matching inside a set of nested attributes.
For example, in ctnetlink messages, if we look for the CTA_V6_SRC attribute in a message that talks about an IPv4 connection, SKF_AD_NLATTR returns the offset of CTA_STATUS which has the same value of CTA_V6_SRC but outside the nest. To differenciate CTA_STATUS and CTA_V6_SRC, we would have to make assumptions on the size of the attribute and the usual offset, resulting in horrible BSF code.
This patch adds SKF_AD_NLATTR_NEST, which is a variant of SKF_AD_NLATTR, that looks for an attribute inside the limits of a nested attributes, but not further.
---
include/linux/filter.h | 3 ++- net/core/filter.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletions(-)
include/linux/filter.h +2 -1
@@ -122,7 +122,8 @@ struct sock_fprog /* Required for SO_ATTACH_FILTER. */#define SKF_AD_PKTTYPE 4#define SKF_AD_IFINDEX 8#define SKF_AD_NLATTR 12 -#define SKF_AD_MAX 16 +#define SKF_AD_NLATTR_NEST 16 +#define SKF_AD_MAX 20#define SKF_NET_OFF (-0x100000)#define SKF_LL_OFF (-0x200000)
net/core/filter.c +15 -0
@@ -319,6 +319,21 @@ load_b:A =0 ;continue ; } +case SKF_AD_NLATTR_NEST : { +struct nlattr *nla; + +if (skb_is_nonlinear (skb)) +return 0 ; +if (A > skb->len -sizeof (struct nlattr )) +return 0 ; + + nla =nla_find_nested ((struct nlattr *)&skb->data[A ],X ); +if (nla) +A = (void *)nla - (void *)skb->data; +else +A =0 ; +continue ; + }default :return 0 ; }
David Miller
maintainerFrom: Pablo Neira Ayuso <[email protected]>
Date: Mon, 17 Nov 2008 09:31:37 +0100
Quoted 13 lines
SKF_AD_NLATTRallows us to find the first matching attribute in a stream of netlink attributes from one offset to the end of the netlink message. This is not suitable to look for a specific matching inside a set of nested attributes.For example, in ctnetlink messages, if we look for the
CTA_V6_SRCattribute in a message that talks about an IPv4 connection,SKF_AD_NLATTRreturns the offset ofCTA_STATUSwhich has the same value ofCTA_V6_SRCbut outside the nest. To differenciateCTA_STATUSandCTA_V6_SRC, we would have to make assumptions on the size of the attribute and the usual offset, resulting in horrible BSF code.
Quoted 5 lines
This patch adds
SKF_AD_NLATTR_NEST, which is a variant ofSKF_AD_NLATTR, that looks for an attribute inside the limits of a nested attributes, but not further.Signed-off-by Pablo Neira Ayuso <[email protected]>
This looks fine to me, Patrick is it ok with you too?
If Patrick has no objections I'll apply it to net-next-2.6
Quoted 18 lines · David Miller
From: Pablo Neira Ayuso <[email protected]>
Quoted 17 lines
SKF_AD_NLATTRallows us to find the first matching attribute in a stream of netlink attributes from one offset to the end of the netlink message. This is not suitable to look for a specific matching inside a set of nested attributes.For example, in ctnetlink messages, if we look for the
CTA_V6_SRCattribute in a message that talks about an IPv4 connection,SKF_AD_NLATTRreturns the offset ofCTA_STATUSwhich has the same value ofCTA_V6_SRCbut outside the nest. To differenciateCTA_STATUSandCTA_V6_SRC, we would have to make assumptions on the size of the attribute and the usual offset, resulting in horrible BSF code.This patch adds
SKF_AD_NLATTR_NEST, which is a variant ofSKF_AD_NLATTR, that looks for an attribute inside the limits of a nested attributes, but not further.
Quoted 5 lines
Quoted 1 line
Signed-off-by Pablo Neira Ayuso <[email protected]>This looks fine to me, Patrick is it ok with you too?
If Patrick has no objections I'll apply it to net-next-2.6
I think this needs more validation to avoid overruning the skb data:
net/core/filter.c load_b: · line 330
Quoted 9 lines
net/core/filter.c +9
-0+case SKF_AD_NLATTR_NEST : { +struct nlattr *nla; + +if (skb_is_nonlinear (skb)) +return 0 ; +if (A > skb->len -sizeof (struct nlattr )) +return 0 ; + + nla =nla_find_nested ((struct nlattr *)&skb->data[A ],X );
This interprets skb->data as nlattr and takes the nla_len member as limit for nla_find(), so it needs to be validated not to exceed the skb length.
Besides that, the patch looks fine.