From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85E33C43381 for ; Fri, 22 Feb 2019 22:15:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 52D2E20675 for ; Fri, 22 Feb 2019 22:15:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="RPo13r9D" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726578AbfBVWPI (ORCPT ); Fri, 22 Feb 2019 17:15:08 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:44498 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726464AbfBVWPG (ORCPT ); Fri, 22 Feb 2019 17:15:06 -0500 Received: by mail-qk1-f195.google.com with SMTP id r21so2062526qkl.11 for ; Fri, 22 Feb 2019 14:15:05 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=u8MhsskZzBKyiuoQmXsZAlMqTqs6nWg2wrFMhyOUChc=; b=RPo13r9Dh8mhesDutvHANZrrUSgINX+a270rhCVdGHe8Nw3ULPnx5NB6Z8dXkv0Bns /2jhlAChL8CLvRSV9bBbgxNxsIkqf9FVgecOPiP7s9F9BSBVOz1wvSy71AK6rKFBgSUn 1UnMiFUStH54a1qOIBtuFzduBT8ZK0rtDh0tRaj4UMGS/3DsDGdRLkb8AaFO+GcVOA6w k+x17EIBYZlIdVHkcIPmPbWK1viaKR4hajGvjlY9XMSFc9FZRNh5TRQcMDvFTTTmavN9 c3GeLQd+fogQ2jKkn9AkpRk7SdMuggiDkQEmGB1jhWubr7jDmPhOFXlCo0x9+MCvsNEA F2AA== 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:mime-version:content-transfer-encoding; bh=u8MhsskZzBKyiuoQmXsZAlMqTqs6nWg2wrFMhyOUChc=; b=C6Hf2Bla8N2q0/bEPU6Gb70v4xgs989fiuQ9KYYji4IUDWqhKVHS9ldE5pcas9+Trk Q1AZN69OUHzvlk9zcGIXnZFzFsfA+IxPcQSLhnLFifU2HQMA2ZLEoO+ObpuD6+5ii8Ha uepiO6v6/EEwnuMvISNXnOOX5DsbJn3/lfxK74Yuxg97ifOOXKNg+/Xz6YW9KwnRXiqN OfF1PHJs5GpXasRc5c10pNQ9Zfy/F8/rF3hnzyuP5uoWfPWA2XGWgogZGQzIbLt30B71 /6KLGEjNH9QCoTEQyB6adKjey+F8P7Zqxxi+Dz9wiL5+k+ZUGuUFwzK8D7skeTX1fTsQ snPA== X-Gm-Message-State: AHQUAuaFeedEt1QuvZjeDM5bsmE15OqNH5GNTdeiGuRYpSr4mg2LjGP4 0GCWt2RTiVPTZ9jcHhUeIzR1Qw== X-Google-Smtp-Source: AHgI3IZsVn5LOyqMGbky6jyPsJb4Clu1VK5wIYF/D9YOpm0mzQ11aF+q6ErzxRL14RxRTkpuSJzbHw== X-Received: by 2002:a37:2cc2:: with SMTP id s185mr4578779qkh.72.1550873705547; Fri, 22 Feb 2019 14:15:05 -0800 (PST) Received: from jkicinski-Precision-T1700.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id j66sm2707211qkj.27.2019.02.22.14.15.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Feb 2019 14:15:05 -0800 (PST) From: Jakub Kicinski To: davem@davemloft.net, jiri@resnulli.us Cc: mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com, Jakub Kicinski Subject: [PATCH net-next v3 6/6] devlink: add missing NULL checks for devlink ops Date: Fri, 22 Feb 2019 14:07:57 -0800 Message-Id: <20190222220758.7117-7-jakub.kicinski@netronome.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190222220758.7117-1-jakub.kicinski@netronome.com> References: <20190222220758.7117-1-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 76726ccb7f46 ("devlink: add flash update command") and commit 2d8dc5bbf4e7 ("devlink: Add support for reload") access devlink ops without NULL-checking. Add the missing checks. Note that all drivers currently implementing devlink pass non-NULL ops, so this is not a problem. Reported-by: Florian Fainelli Signed-off-by: Jakub Kicinski --- net/core/devlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/core/devlink.c b/net/core/devlink.c index 78c6ea1870ca..38cb0239dede 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -2651,7 +2651,7 @@ static int devlink_nl_cmd_reload(struct sk_buff *skb, struct genl_info *info) struct devlink *devlink = info->user_ptr[0]; int err; - if (!devlink->ops->reload) + if (!devlink->ops || !devlink->ops->reload) return -EOPNOTSUPP; err = devlink_resources_validate(devlink, NULL, info); @@ -2669,7 +2669,7 @@ static int devlink_nl_cmd_flash_update(struct sk_buff *skb, const char *file_name, *component; struct nlattr *nla_component; - if (!devlink->ops->flash_update) + if (!devlink->ops || !devlink->ops->flash_update) return -EOPNOTSUPP; if (!info->attrs[DEVLINK_ATTR_FLASH_UPDATE_FILE_NAME]) -- 2.19.2