[PATCH -next] xen-netback: fix fragments error handling in checksum_setup_ip()

[PATCH -next] xen-netback: fix fragments error handling in checksum_setup_ip()

[Wei Yongjun]

From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Fix to return -EPROTO error if fragments detected in checksum_setup_ip().

Fixes: 1431fb31ecba ('xen-netback: fix fragment detection in checksum setup')
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/net/xen-netback/netback.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c
index 800496b..773b731 100644
--- a/drivers/net/xen-netback/netback.c
+++ b/drivers/net/xen-netback/netback.c
@@ -1099,6 +1099,9 @@ static int checksum_setup_ip(struct xenvif *vif, struct sk_buff *skb,
 
 	err = -EPROTO;
 
+	if (fragment)
+		goto out;
+
 	switch (ip_hdr(skb)->protocol) {
 	case IPPROTO_TCP:
 		err = maybe_pull_tail(skb,

RE: [PATCH -next] xen-netback: fix fragments error handling in checksum_setup_ip()

[Paul Durrant]

> -----Original Message-----
> From: Wei Yongjun [mailto:weiyj.lk@gmail.com]
> Sent: 16 December 2013 02:45
> To: Ian Campbell; Wei Liu; Paul Durrant; Zoltan Kiss; davem@davemloft.net
> Cc: yongjun_wei@trendmicro.com.cn; xen-devel@lists.xenproject.org;
> netdev@vger.kernel.org
> Subject: [PATCH -next] xen-netback: fix fragments error handling in
> checksum_setup_ip()
> 
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> 
> Fix to return -EPROTO error if fragments detected in checksum_setup_ip().
> 
> Fixes: 1431fb31ecba ('xen-netback: fix fragment detection in checksum
> setup')
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> ---
>  drivers/net/xen-netback/netback.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-
> netback/netback.c
> index 800496b..773b731 100644
> --- a/drivers/net/xen-netback/netback.c
> +++ b/drivers/net/xen-netback/netback.c
> @@ -1099,6 +1099,9 @@ static int checksum_setup_ip(struct xenvif *vif,
> struct sk_buff *skb,
> 
>  	err = -EPROTO;
> 
> +	if (fragment)
> +		goto out;
> +

Good grief. This hunk must have got lost from my original patch. My old tree has it there. So...

Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

>  	switch (ip_hdr(skb)->protocol) {
>  	case IPPROTO_TCP:
>  		err = maybe_pull_tail(skb,

Re: [PATCH -next] xen-netback: fix fragments error handling in checksum_setup_ip()

[Ian Campbell]

On Mon, 2013-12-16 at 09:40 +0000, Paul Durrant wrote:
> > -----Original Message-----
> > From: Wei Yongjun [mailto:weiyj.lk@gmail.com]
> > Sent: 16 December 2013 02:45
> > To: Ian Campbell; Wei Liu; Paul Durrant; Zoltan Kiss; davem@davemloft.net
> > Cc: yongjun_wei@trendmicro.com.cn; xen-devel@lists.xenproject.org;
> > netdev@vger.kernel.org
> > Subject: [PATCH -next] xen-netback: fix fragments error handling in
> > checksum_setup_ip()
> > 
> > From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> > 
> > Fix to return -EPROTO error if fragments detected in checksum_setup_ip().
> > 
> > Fixes: 1431fb31ecba ('xen-netback: fix fragment detection in checksum
> > setup')
> > Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
> > ---
> >  drivers/net/xen-netback/netback.c | 3 +++
> >  1 file changed, 3 insertions(+)
> > 
> > diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-
> > netback/netback.c
> > index 800496b..773b731 100644
> > --- a/drivers/net/xen-netback/netback.c
> > +++ b/drivers/net/xen-netback/netback.c
> > @@ -1099,6 +1099,9 @@ static int checksum_setup_ip(struct xenvif *vif,
> > struct sk_buff *skb,
> > 
> >  	err = -EPROTO;
> > 
> > +	if (fragment)
> > +		goto out;
> > +
> 
> Good grief. This hunk must have got lost from my original patch. My old tree has it there. So...
> 
> Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

Acked-by: Ian Campbell <ian.campbell@citrix.com>

Re: [PATCH -next] xen-netback: fix fragments error handling in checksum_setup_ip()

[David Miller]

From: Paul Durrant <Paul.Durrant@citrix.com>
Date: Mon, 16 Dec 2013 09:40:37 +0000

>> -----Original Message-----
>> From: Wei Yongjun [mailto:weiyj.lk@gmail.com]
>> Sent: 16 December 2013 02:45
>> To: Ian Campbell; Wei Liu; Paul Durrant; Zoltan Kiss; davem@davemloft.net
>> Cc: yongjun_wei@trendmicro.com.cn; xen-devel@lists.xenproject.org;
>> netdev@vger.kernel.org
>> Subject: [PATCH -next] xen-netback: fix fragments error handling in
>> checksum_setup_ip()
>> 
>> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> 
>> Fix to return -EPROTO error if fragments detected in checksum_setup_ip().
>> 
>> Fixes: 1431fb31ecba ('xen-netback: fix fragment detection in checksum
>> setup')
>> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>> ---
>>  drivers/net/xen-netback/netback.c | 3 +++
>>  1 file changed, 3 insertions(+)
>> 
>> diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-
>> netback/netback.c
>> index 800496b..773b731 100644
>> --- a/drivers/net/xen-netback/netback.c
>> +++ b/drivers/net/xen-netback/netback.c
>> @@ -1099,6 +1099,9 @@ static int checksum_setup_ip(struct xenvif *vif,
>> struct sk_buff *skb,
>> 
>>  	err = -EPROTO;
>> 
>> +	if (fragment)
>> +		goto out;
>> +
> 
> Good grief. This hunk must have got lost from my original patch. My old tree has it there. So...
> 
> Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

Why is this targetted at -next?  The guilty commit this is fixing is present
in Linus's tree.

I'm going to apply it to 'net', but please take the time to specify
the correct destination tree in the future.

Thanks.