Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit fcca143d696092110ae1e361866576804fe887f3

Authored by Wei Yongjun
Committed by David S. Miller
1 parent 14109a59ca
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

net/core/rtnetlink.c
Diff comments   View file @ fcca143
... ... @@ -496,8 +496,10 @@
496 496 }
497 497 if (ops->fill_info) {
498 498 data = nla_nest_start(skb, IFLA_INFO_DATA);
499   - if (data == NULL)
  499 + if (data == NULL) {
  500 + err = -EMSGSIZE;
500 501 goto err_cancel_link;
  502 + }
501 503 err = ops->fill_info(skb, dev);
502 504 if (err < 0)
503 505 goto err_cancel_data;