From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wang Weidong Subject: [PATCH v2] ethtool: check the ethtool_ops is NULL in dev_ethtool Date: Tue, 18 Feb 2014 09:42:56 +0800 Message-ID: <5302BAA0.9060905@huawei.com> References: <5301F32C.4040704@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit Cc: , Daniel Borkmann To: David Miller Return-path: Received: from szxga03-in.huawei.com ([119.145.14.66]:35962 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752394AbaBRBnX (ORCPT ); Mon, 17 Feb 2014 20:43:23 -0500 In-Reply-To: <5301F32C.4040704@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: some drivers maybe not implement the ethtool_ops with only set NULL to ethtool_ops. So when call the ethtool devx will lead to a 'NULL pointer dereference'. So add a check in dev_ethtool Signed-off-by: Wang Weidong --- Change note: v2: fix a trailing whitespace/tab pointed out by Daniel --- net/core/ethtool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 30071de..c8cfd8f 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1500,6 +1500,9 @@ int dev_ethtool(struct net *net, struct ifreq *ifr) return -EPERM; } + if (!dev->ethtool_ops) + return -EOPNOTSUPP; + if (dev->ethtool_ops->begin) { rc = dev->ethtool_ops->begin(dev); if (rc < 0) -- 1.7.12