Prev: ixgbe: backport bug fix for tx panic
Next: [PATCH 01a/10] perf, trace: Fix !x86 build issue
From: Bjørn Mork on 25 May 2010 03:30
Greg KH <gregkh(a)suse.de> writes:

> 2.6.34-stable review patch. If anyone has any objections, please let us know.
>
> ------------------
>
> From: Bjørn Mork <bjorn(a)mork.no>
>
> commit ccc2d97cb7c798e785c9f198de243e2b59f7073b upstream.

This is already in 2.6.34 AFAIK.



Bjørn

> commit 2783ef23 moved the initialisation of saddr and daddr after
> pskb_may_pull() to avoid a potential data corruption. Unfortunately
> also placing it after the short packet and bad checksum error paths,
> where these variables are used for logging. The result is bogus
> output like
>
> [92238.389505] UDP: short packet: From 2.0.0.0:65535 23715/178 to 0.0.0.0:65535
>
> Moving the saddr and daddr initialisation above the error paths, while still
> keeping it after the pskb_may_pull() to keep the fix from commit 2783ef23.
>
> Signed-off-by: Bjørn Mork <bjorn(a)mork.no>
> Acked-by: Eric Dumazet <eric.dumazet(a)gmail.com>
> Signed-off-by: David S. Miller <davem(a)davemloft.net>
> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>
>
> ---
> net/ipv4/udp.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> --- a/net/ipv4/udp.c
> +++ b/net/ipv4/udp.c
> @@ -1292,6 +1292,9 @@ int __udp4_lib_rcv(struct sk_buff *skb,
>
> uh = udp_hdr(skb);
> ulen = ntohs(uh->len);
> + saddr = ip_hdr(skb)->saddr;
> + daddr = ip_hdr(skb)->daddr;
> +
> if (ulen > skb->len)
> goto short_packet;
>
> @@ -1305,9 +1308,6 @@ int __udp4_lib_rcv(struct sk_buff *skb,
> if (udp4_csum_init(skb, uh, proto))
> goto csum_error;
>
> - saddr = ip_hdr(skb)->saddr;
> - daddr = ip_hdr(skb)->daddr;
> -
> if (rt->rt_flags & (RTCF_BROADCAST|RTCF_MULTICAST))
> return __udp4_lib_mcast_deliver(net, skb, uh,
> saddr, daddr, udptable);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 25 May 2010 10:10
On Tue, May 25, 2010 at 09:08:59AM +0200, Bj�rn Mork wrote:
> Greg KH <gregkh(a)suse.de> writes:
>
> > 2.6.34-stable review patch. If anyone has any objections, please let us know.
> >
> > ------------------
> >
> > From: Bj�rn Mork <bjorn(a)mork.no>
> >
> > commit ccc2d97cb7c798e785c9f198de243e2b59f7073b upstream.
>
> This is already in 2.6.34 AFAIK.

Yes, sorry, that should have said '2.6.32-stable review patch' above :(

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: ixgbe: backport bug fix for tx panic
Next: [PATCH 01a/10] perf, trace: Fix !x86 build issue