From patchwork Tue Jul 17 02:08:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 944662 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=netronome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="EgJqsmKk"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41V3cM3hSwz9s0n for ; Tue, 17 Jul 2018 12:09:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730094AbeGQCjN (ORCPT ); Mon, 16 Jul 2018 22:39:13 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:43972 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729983AbeGQCjN (ORCPT ); Mon, 16 Jul 2018 22:39:13 -0400 Received: by mail-qk0-f193.google.com with SMTP id z74-v6so21545287qkb.10 for ; Mon, 16 Jul 2018 19:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3i9O9r04P/ziMJ0u9jWBtujT2vZxOcVAi6B+bfKWHZo=; b=EgJqsmKkKShd3t9nBRbHiiDI/5t0DI3DVA+ogd8zUwi3hE32IcRubdErEBgZfVIpTL XdZSIJLqmsi6RNgou+e5x+tNtfs7c9QbPl32ODFT2Tfbssdtrvu+H6nl0AKDAcM9siQ9 zGTeXJ8q6/H0li2RkiVGA8FGdQXsjf9IUsG+QZwZojLdbvL5NRwp78+cfx7xyoI1WXhI yY5fr0ziJ9r3F/+yxOAmk3lWtLA6sSiNyyb8w7td0K1quZBalle7KW1CQZBe/ADv00Sg bYY+t33unFOJqM/Qq9BWpuSwMKEj8R+Ymyk+8ypMnl1CeRyu9h234WrzgsgJjIL8jD/P UXWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3i9O9r04P/ziMJ0u9jWBtujT2vZxOcVAi6B+bfKWHZo=; b=pO2HWkXpmhCBk46FW1jbNwddnIegQW3AgC//m/pAgTNcNHFGStWWNddWJptSCkLrB8 BiqmMGeD0a2bJ4b5zLUUo15ptOYS7dqE1ZMWgSIemd/GES4sCpUH+a5vKrvwI4E4oAIv eriBhH5ZnBvf6vtPo9ULe+z75cM/8TSaEapq1lcTl6bUdpoAnOiC/RDa6BKXvs6vS0bw 7qzC0X2//EkVfPWl9B9Y3+93PMH4hRG2Y5W8Q6FDFkC8iFaZI/f3c7P+UQqawIeQzfZH di/0lT4LfQS7tWHWesIVloJe40eeOjex57EfhSdB3jOfG/mxQj1Di309FDkO5fHgcXLU IeJg== X-Gm-Message-State: AOUpUlEC7V79sci2CIwO53UiH7YfBhZo81EMaSjAg6yK7CQKb6ethk32 X5FZET6sHJbXHcAn4fmI7ReXPQ== X-Google-Smtp-Source: AAOMgpdSGUg/TnJg0w1nvuE5P0Sie/0DHe5kj1GYu5D1Lk0N3D0kfAJSdWeNp0uySD7x4Y506fNK3Q== X-Received: by 2002:a37:a814:: with SMTP id r20-v6mr16329118qke.153.1531793343332; Mon, 16 Jul 2018 19:09:03 -0700 (PDT) Received: from jkicinski-Precision-T1700.netronome.com ([75.53.12.129]) by smtp.gmail.com with ESMTPSA id j20-v6sm27643657qtc.71.2018.07.16.19.09.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Jul 2018 19:09:02 -0700 (PDT) From: Jakub Kicinski To: davem@davemloft.net Cc: daniel@iogearbox.net, alexei.starovoitov@gmail.com, kbuild-all@01.org, oss-drivers@netronome.com, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH net-next] xdp: fix uninitialized 'err' variable Date: Mon, 16 Jul 2018 19:08:50 -0700 Message-Id: <20180717020850.16510-1-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180717015758.GB10593@intel.com> References: <20180717015758.GB10593@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 Acked-by: Daniel Borkmann --- net/core/rtnetlink.c | 15 +++++++++------ 1 file 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) prog_id = 0; mode = XDP_ATTACHED_NONE; - if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_SKB, - IFLA_XDP_SKB_PROG_ID, rtnl_xdp_prog_skb)) + err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_SKB, + IFLA_XDP_SKB_PROG_ID, rtnl_xdp_prog_skb); + if (err) goto err_cancel; - if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_DRV, - IFLA_XDP_DRV_PROG_ID, rtnl_xdp_prog_drv)) + err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_DRV, + IFLA_XDP_DRV_PROG_ID, rtnl_xdp_prog_drv); + if (err) goto err_cancel; - if (rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_HW, - IFLA_XDP_HW_PROG_ID, rtnl_xdp_prog_hw)) + err = rtnl_xdp_report_one(skb, dev, &prog_id, &mode, XDP_ATTACHED_HW, + IFLA_XDP_HW_PROG_ID, rtnl_xdp_prog_hw); + if (err) goto err_cancel; err = nla_put_u8(skb, IFLA_XDP_ATTACHED, mode);