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=-8.5 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_MUTT 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 D7C67C43381 for ; Sun, 24 Feb 2019 11:13:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9D04320652 for ; Sun, 24 Feb 2019 11:13:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="0gcm8lNE" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726621AbfBXLNB (ORCPT ); Sun, 24 Feb 2019 06:13:01 -0500 Received: from mail-wm1-f68.google.com ([209.85.128.68]:55422 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725920AbfBXLNB (ORCPT ); Sun, 24 Feb 2019 06:13:01 -0500 Received: by mail-wm1-f68.google.com with SMTP id q187so5559202wme.5 for ; Sun, 24 Feb 2019 03:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=n+hTCbDJl8MNMrRC6her/Sx0EzoQgeoMp/Va50KmTKM=; b=0gcm8lNE9N2u6V0LVpOPRgKG7OdFaIWHkEKc0NqM9ChRZ/RpBCfVyElVK+LcUeGj4p ntGWWayoWeOhh71zV+gTwSR3jtQYJcE0UaNI0jG5sA/DDEgW09l1ZtheLuhs0k2gSilF nQ2X8NsvzClAdP9apN7c2i591NNjZ8b9z1riLUnBmZiiqPg1Gk8mNirJyalnjZTzI4pB sBvGKY8/lzIsT65lCF/AuVAaWUiCcsEWc2YJoCKFjrCf6rJng0pLIpAzJM1iFwWoz/Ez Oj5Jvopb2LqKIn9Cw6GhWR2sEqLrxk7OvXPOHZ35W7bx0bbnoNXny+1GpYb8+NTTzxVG 6OdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=n+hTCbDJl8MNMrRC6her/Sx0EzoQgeoMp/Va50KmTKM=; b=OMmrvyTkdGMTDrafhH3oxuQYlM8bcdFmZz+2sQG5m89dZiqrqrLMvXbcTHa3wGoULg SpOKatUqS+RZMhvbAze4SyR27V+wcLULwFJIJNMliamPDNW1IpCNwmypjq72IqaeO6x9 W2+0vXrLPZUIQhiOKRgRAEhav9XamBXlu+xPpMkh1VISw1ZwsJmRKQdVnHQrm+ZEarXy F2IBmgT+z2K/6qWQOnBw6HhqQW1uRmpGDILO1yrssUwQu/qYmOl67MPE5RZu9Xgef8Xi 9qOcGGZD5if60Wzie/Gfh33hql6ciKtNd96SFv0QoVl1/ugyKqzCMGw1P3IGD3MmhYQK 0QGQ== X-Gm-Message-State: AHQUAubXLFPYX0w3I0oQX/Y7E91PeeZBjZvItyc0wedUxZzc0+B3lVYs 6GXRGXF7rOWFHkN/P/q1H59prw== X-Google-Smtp-Source: AHgI3IY2L7vAllArMlvOkx4oj5KnN+V59kxg6fyJtJ6EJQx4k1eE5sDTlTj2ivoU2mlXMXM0RjzRjw== X-Received: by 2002:a1c:7d56:: with SMTP id y83mr7096354wmc.94.1551006778771; Sun, 24 Feb 2019 03:12:58 -0800 (PST) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id p16sm15065709wro.25.2019.02.24.03.12.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Feb 2019 03:12:58 -0800 (PST) Date: Sun, 24 Feb 2019 12:03:19 +0100 From: Jiri Pirko To: Jakub Kicinski Cc: davem@davemloft.net, mkubecek@suse.cz, andrew@lunn.ch, f.fainelli@gmail.com, netdev@vger.kernel.org, oss-drivers@netronome.com Subject: Re: [PATCH net-next v3 6/6] devlink: add missing NULL checks for devlink ops Message-ID: <20190224110319.GJ2759@nanopsycho.orion> References: <20190222220758.7117-1-jakub.kicinski@netronome.com> <20190222220758.7117-7-jakub.kicinski@netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190222220758.7117-7-jakub.kicinski@netronome.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fri, Feb 22, 2019 at 11:07:57PM CET, jakub.kicinski@netronome.com wrote: >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. Wouldn't it be better to rather put WARN_ON&fail when driver calls devlink_alloc() with NULL ops and avoid these checks in the whole code? > >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 >