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 6515BC4360F for ; Sat, 23 Mar 2019 23:21:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 28CC721741 for ; Sat, 23 Mar 2019 23:21:07 +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="SQ4hbouj" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727609AbfCWXVG (ORCPT ); Sat, 23 Mar 2019 19:21:06 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36524 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726727AbfCWXVG (ORCPT ); Sat, 23 Mar 2019 19:21:06 -0400 Received: by mail-wr1-f67.google.com with SMTP id y13so6163582wrd.3 for ; Sat, 23 Mar 2019 16:21:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=JUc0wQQQ1vlEu/nvIgrkaPk91fFsFvlzMyzYX0b65Zw=; b=SQ4hbouj9A1nWbrW0pHsYKgirrjfG1fFEW08iTWGWnICkl3MRaG6ZuEh/HRLWCtwNv ZbdtYWL8bxz18/jBq+cTzNRgeqmRJV3GCIcLo+2n8ZkJWG6m3oIow9rLATyl4C3kXuxB ZZXYTzdJYyE6Q0nPfUwoPwX5r/ePjJtkNIhPHXQ3Of5yCGrTeswBokZ25isITCwQliqT Zigqj39wtIQV6SFxl5uyuzFrG9kWmusK6hiNpGXfRF3FTBuYN9OJ+aP4AbX/mDuDxMli 1p7RMaX3i0rGifUI6t6aCk8Wgli2lglDxa4IGCFsVwT46FmcmNwqjSkAc0BewPCiaMNx WutQ== 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; bh=JUc0wQQQ1vlEu/nvIgrkaPk91fFsFvlzMyzYX0b65Zw=; b=mhBfhmcriQXrl9SFZPQh4cJwlD/TVIYNXrEzjUMAydFfRDDee6TxHKTVI1LIQwF4/G QAkZ38zCi/UgBd97XmlHPXnKM49mMUq16ZMx1Ay3EeOPfKznl5pOrQxl+RpPZpw1jiWI UlBvr/BwdojttsL6UyKEI1vzaEAJqXv353NI+m3FepBx2uAK7xbprb6OOHAN0R0zO3Qj pi3ILrRQ/UZapBfKPsBn54EhNB/M8NK4b6eY1/z8Huh8pSFaCPylLfgFRJUK3RcRTbDC GOxmaHOm/pLKf87RDegtxbg6bs1TedCkubktctChHciwGpRP1k6sUIR0rmjx0TMefea6 tM0A== X-Gm-Message-State: APjAAAWqzqPTBBbD0hTIAb4FsQtn2/I5/tYTvmL5oD9Nhaf3yUXExvzC Xy8taakhc5T8jgjlEk+vLs2WX40sjIE= X-Google-Smtp-Source: APXvYqynaPnB9DYzTJxBYIgTvxs0H5fjgpK7H1wFfBl12oq0kqTFWVGjTyDdAExcb8jPpxiEU51DeA== X-Received: by 2002:a5d:68cd:: with SMTP id p13mr11142536wrw.22.1553383264063; Sat, 23 Mar 2019 16:21:04 -0700 (PDT) Received: from localhost (ip-94-113-125-71.net.upcbroadband.cz. [94.113.125.71]) by smtp.gmail.com with ESMTPSA id p10sm8966965wrs.5.2019.03.23.16.21.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 23 Mar 2019 16:21:03 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com Subject: [patch net] net: devlink: skip info_get op call if it is not defined in dumpit Date: Sun, 24 Mar 2019 00:21:03 +0100 Message-Id: <20190323232103.26673-1-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko In dumpit, unlike doit, the check for info_get op being defined is missing. Add it and avoid null pointer dereference in case driver does not define this op. Fixes: f9cf22882c60 ("devlink: add device information API") Reported-by: Ido Schimmel Signed-off-by: Jiri Pirko --- net/core/devlink.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/net/core/devlink.c b/net/core/devlink.c index 78e22cea4cc7..da0a29f30885 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -3897,6 +3897,11 @@ static int devlink_nl_cmd_info_get_dumpit(struct sk_buff *msg, continue; } + if (!devlink->ops->info_get) { + idx++; + continue; + } + mutex_lock(&devlink->lock); err = devlink_nl_info_fill(msg, devlink, DEVLINK_CMD_INFO_GET, NETLINK_CB(cb->skb).portid, -- 2.17.2