summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-03-27 04:22:45 +0100
committerDavid S. Miller <davem@davemloft.net>2013-03-27 19:06:40 +0100
commitfcca143d696092110ae1e361866576804fe887f3 (patch)
treec29dc3ede47aaf5d93ebf2ccaf23d731bdbfdc15 /net
parentenet: fec: fix fail resume from suspend state (diff)
downloadlinux-fcca143d696092110ae1e361866576804fe887f3.tar.xz
linux-fcca143d696092110ae1e361866576804fe887f3.zip
rtnetlink: fix error return code in rtnl_link_fill()
Fix to return a negative error code from the error handling case instead of 0(possible overwrite to 0 by ops->fill_xstats call), as returned elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/rtnetlink.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 5fb8d7e47294..b65441da74ab 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -496,8 +496,10 @@ static int rtnl_link_fill(struct sk_buff *skb, const struct net_device *dev)
}
if (ops->fill_info) {
data = nla_nest_start(skb, IFLA_INFO_DATA);
- if (data == NULL)
+ if (data == NULL) {
+ err = -EMSGSIZE;
goto err_cancel_link;
+ }
err = ops->fill_info(skb, dev);
if (err < 0)
goto err_cancel_data;