[3.11.y.z extended stable] Patch "ieee802154: Fix memory leak in ieee802154_add_iface()" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    ieee802154: Fix memory leak in ieee802154_add_iface()

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 830b749d58336ed4d1103e286551f99c71b87140 Mon Sep 17 00:00:00 2001
From: Christian Engelmayer <cengelma at gmx.at>
Date: Sat, 11 Jan 2014 22:19:30 +0100
Subject: ieee802154: Fix memory leak in ieee802154_add_iface()

commit 267d29a69c6af39445f36102a832b25ed483f299 upstream.

Fix a memory leak in the ieee802154_add_iface() error handling path.
Detected by Coverity: CID 710490.

Signed-off-by: Christian Engelmayer <cengelma at gmx.at>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 net/ieee802154/nl-phy.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/ieee802154/nl-phy.c b/net/ieee802154/nl-phy.c
index 22b1a70..4efd237 100644
--- a/net/ieee802154/nl-phy.c
+++ b/net/ieee802154/nl-phy.c
@@ -224,8 +224,10 @@ static int ieee802154_add_iface(struct sk_buff *skb,

 	if (info->attrs[IEEE802154_ATTR_DEV_TYPE]) {
 		type = nla_get_u8(info->attrs[IEEE802154_ATTR_DEV_TYPE]);
-		if (type >= __IEEE802154_DEV_MAX)
-			return -EINVAL;
+		if (type >= __IEEE802154_DEV_MAX) {
+			rc = -EINVAL;
+			goto nla_put_failure;
+		}
 	}

 	dev = phy->add_iface(phy, devname, type);
--
1.8.3.2