From patchwork Thu Mar 17 16:37:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roger Luethi X-Patchwork-Id: 87396 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 99DC8B6FE1 for ; Fri, 18 Mar 2011 03:37:27 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025Ab1CQQhW (ORCPT ); Thu, 17 Mar 2011 12:37:22 -0400 Received: from mail12.bluewin.ch ([195.186.19.61]:58602 "EHLO mail12.bluewin.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751572Ab1CQQhV (ORCPT ); Thu, 17 Mar 2011 12:37:21 -0400 X-FXIT-IP: IPv4[85.3.235.43] Epoch[1300379840] Received: from [85.3.235.43] ([85.3.235.43:17519] helo=core.hellgate.ch) by mail12.bluewin.ch (envelope-from ) (ecelerity 2.2.2.41 r(31179/31189)) with ESMTP id FF/09-04057-FB8328D4; Thu, 17 Mar 2011 16:37:19 +0000 Received: by core.hellgate.ch (Postfix, from userid 1000) id 111402F81E4; Thu, 17 Mar 2011 17:37:21 +0100 (CET) Date: Thu, 17 Mar 2011 17:37:21 +0100 From: Roger Luethi To: netdev@vger.kernel.org Subject: [PATCH] ethtool: __ethtool_set_sg: check for function pointer before using it Message-ID: <20110317163720.GA26284@core.hellgate.ch> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org __ethtool_set_sg does not check if dev->ethtool_ops->set_sg is defined which can result in a NULL pointer dereference when ethtool is used to change SG settings for drivers without SG support. Signed-off-by: Roger Luethi Reviewed-by: Ben Hutchings --- Bug verified. Patch only compile-tested. net/core/ethtool.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/core/ethtool.c b/net/core/ethtool.c index c1a71bb..a1086fb 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c @@ -1457,6 +1457,9 @@ static int __ethtool_set_sg(struct net_device *dev, u32 data) { int err; + if (!dev->ethtool_ops->set_sg) + return -EOPNOTSUPP; + if (data && !(dev->features & NETIF_F_ALL_CSUM)) return -EINVAL;