On Fri, 2013-02-15 at 15:56 +0000, [email protected] wrote: > On Fri, Feb 15, 2013 at 01:35:00PM +0000, Ian Campbell wrote: > > On Fri, 2013-02-15 at 13:19 +0000, Herton Ronaldo Krzesinski wrote: > > > > /* Skip first skb fragment if it is on same page as header > > > > fragment. */ > > > > - start = ((unsigned long)shinfo->frags[0].page == pending_idx); > > > > + start = ((unsigned long)shinfo->frags[i].page == pending_idx); > > > > > > This is wrong, change is not on original patch and i is unitialized here. > > > > Yes good catch, not sure how this snuck in. > > > > Greg, do you want me to respin or can you munge locally? The original > > "-" line is the correct one. > > I need a patch on top of this as this problem is already in the 3.0.64 > release I did yesterday.
OK, here you go. Sorry for the error. Ian. 8<----------------------- >From 2cb6dc15e399ea94bf3ce5bd0b2be467b9357f95 Mon Sep 17 00:00:00 2001 From: Ian Campbell <[email protected]> Date: Tue, 19 Feb 2013 08:54:51 +0000 Subject: [PATCH] xen/netback: check correct frag when looking for head frag When I backported 7d5145d8eb2b "xen/netback: don't leak pages on failure in xen_netbk_tx_check_gop" to 3.0 (where it became f0457844e605) I somehow picked up an extraneous hunk breaking this. Reported-by: Herton Ronaldo Krzesinski <[email protected]> Signed-off-by: Ian Campbell <[email protected]> --- drivers/net/xen-netback/netback.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 9068d32..6ed44c3 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -990,7 +990,7 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk, xen_netbk_idx_release(netbk, pending_idx, XEN_NETIF_RSP_ERROR); /* Skip first skb fragment if it is on same page as header fragment. */ - start = ((unsigned long)shinfo->frags[i].page == pending_idx); + start = ((unsigned long)shinfo->frags[0].page == pending_idx); for (i = start; i < nr_frags; i++) { int j, newerr; -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
