bridge: Pull ip header into skb->data before looking into ip header.
This patch was applied to David Miller's net tree only yesterday. Patches from net tree are typically pushed to Linus tree once a week.
From: Andy Whitcroft [mailto:firstname.lastname@example.org]
Sent: Thursday, October 11, 2012 4:12 PM
To: Jesse Sung
Cc: email@example.com; Bandi,Sarveshwar
Subject: [Acked/comment] [Precise/Quantal][PATCH] bridge: Pull ip header into skb->data before looking into ip header.
On Thu, Oct 11, 2012 at 03:50:41PM +0800, Jesse Sung wrote:
> From: Sarveshwar Bandi <firstname.lastname@example.org>
> BugLink: https://launchpad.net/bugs/1065150
> If lower layer driver leaves the ip header in the skb fragment, it
> needs to be first pulled into skb->data before inspecting ip header
> length or ip version number.
> Signed-off-by: Sarveshwar Bandi <email@example.com>
> Signed-off-by: David S. Miller <firstname.lastname@example.org> (cherry picked
> from commit 6caab7b0544e83e6c160b5e80f5a4a7dd69545c7 net.git)
Is this going to be in mainline soon? I do not see it in Linus' tree as yet, which is presumably why it is not in stable as yet.
> Signed-off-by: Wen-chien Jesse Sung <email@example.com>
> net/bridge/br_netfilter.c | 3 +++
> 1 file changed, 3 insertions(+)
> diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c
> index 577ea5d..7c1745d 100644
> --- a/net/bridge/br_netfilter.c
> +++ b/net/bridge/br_netfilter.c
> @@ -245,6 +245,9 @@ static int br_parse_ip_options(struct sk_buff *skb)
> struct net_device *dev = skb->dev;
> u32 len;
> + if (!pskb_may_pull(skb, sizeof(struct iphdr)))
> + goto inhdr_error;
> iph = ip_hdr(skb);
> opt = &(IPCB(skb)->opt);
The description in the bug is rather better at explaining why we need this.
The patch looks ok overall, I am mildy worried about when it is going to hit mainline. But it also sounds pretty important for bridged scenarios which would include virtual setups. So overall probabally:
Acked-by: Andy Whitcroft <firstname.lastname@example.org>
kernel-team mailing list
|All times are GMT. The time now is 12:39 AM.|
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.