From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 15 Dec 2015 21:21:57 +0000 (+0000)
Subject: tipc: Fix kfree_skb() of uninitialised pointer
X-Git-Tag: v4.3.4~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45847f7580edd4f2d4a819116967517f77b47685;p=thirdparty%2Fkernel%2Fstable.git

tipc: Fix kfree_skb() of uninitialised pointer

Commit 7098356baca7 ("tipc: fix error handling of expanding buffer
headroom") added a "goto tx_error".  This is fine upstream, but
when backported to 4.3 it results in attempting to free the clone
before it has been allocated.  In this early error case, no
cleanup is needed.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 86f2e7c44694a..73bdf1baa266e 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -162,7 +162,7 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
 	if (skb_headroom(skb) < UDP_MIN_HEADROOM) {
 		err = pskb_expand_head(skb, UDP_MIN_HEADROOM, 0, GFP_ATOMIC);
 		if (err)
-			goto tx_error;
+			return err;
 	}
 
 	clone = skb_clone(skb, GFP_ATOMIC);