aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/rtnetlink.c
diff options
context:
space:
mode:
authorJakub Kicinski <jakub.kicinski@netronome.com>2018-07-16 22:08:50 -0400
committerDavid S. Miller <davem@davemloft.net>2018-07-18 16:32:03 -0400
commit202aabe84a8fd809e8f401bc05e20f35a5102ece (patch)
tree15aab561ce6f96021db30882a13ea948cc35cc24 /net/core/rtnetlink.c
parente146471f588e4b8dcd7994036c1b47cc52325f00 (diff)
xdp: fix uninitialized 'err' variable
Smatch caught an uninitialized variable error which GCC seems to miss. Fixes: a25717d2b604 ("xdp: support simultaneous driver and hw XDP attachment") Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/rtnetlink.c')
-rw-r--r--net/core/rtnetlink.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index e03258e954c8..92b6fa5d5f6e 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1414,14 +1414,17 @@ static int rtnl_xdp_fill(struct sk_buff *skb, struct net_device *dev)
1414 1414
1415 prog_id = 0; 1415 prog_id = 0;
1416 mode = XDP_ATTACHED_NONE; 1416 mode = XDP_ATTACHED_NONE;
1417 if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_SKB, 1417 err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_SKB,
1418 IFLA_XDP_SKB_PROG_ID, rtnl_xdp_prog_skb)) 1418 IFLA_XDP_SKB_PROG_ID, rtnl_xdp_prog_skb);
1419 if (err)
1419 goto err_cancel; 1420 goto err_cancel;
1420 if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_DRV, 1421 err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_DRV,
1421 IFLA_XDP_DRV_PROG_ID, rtnl_xdp_prog_drv)) 1422 IFLA_XDP_DRV_PROG_ID, rtnl_xdp_prog_drv);
1423 if (err)
1422 goto err_cancel; 1424 goto err_cancel;
1423 if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_HW, 1425 err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_HW,
1424 IFLA_XDP_HW_PROG_ID, rtnl_xdp_prog_hw)) 1426 IFLA_XDP_HW_PROG_ID, rtnl_xdp_prog_hw);
1427 if (err)
1425 goto err_cancel; 1428 goto err_cancel;
1426 1429
1427 err = nla_put_u8(skb, IFLA_XDP_ATTACHED, mode); 1430 err = nla_put_u8(skb, IFLA_XDP_ATTACHED, mode);