From: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Date: Sat, 10 Mar 2007 07:04:42 +0000 (-0800)
Subject: Fix rtm_to_ifaddr() error return.
X-Git-Tag: v2.6.20.4~32
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1995b605df589e93a11395ca239891187b7f1bdf;p=karo-tx-linux.git

Fix rtm_to_ifaddr() error return.

[IPV4]: Fix rtm_to_ifaddr() error handling.

Return negative error value (embedded in the pointer) instead of
returning NULL.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index 480ace9819f6..728ba5ffe43c 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -503,8 +503,10 @@ static struct in_ifaddr *rtm_to_ifaddr(struct nlmsghdr *nlh)
 		goto errout;
 
 	ifm = nlmsg_data(nlh);
-	if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL)
+	if (ifm->ifa_prefixlen > 32 || tb[IFA_LOCAL] == NULL) {
+		err = -EINVAL;
 		goto errout;
+	}
 
 	dev = __dev_get_by_index(ifm->ifa_index);
 	if (dev == NULL) {