From patchwork Thu Feb 3 21:27:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 81724 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 9556DB70EB for ; Fri, 4 Feb 2011 08:28:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752925Ab1BCV2H (ORCPT ); Thu, 3 Feb 2011 16:28:07 -0500 Received: from swampdragon.chaosbits.net ([90.184.90.115]:11980 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751837Ab1BCV2G (ORCPT ); Thu, 3 Feb 2011 16:28:06 -0500 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id E620C9403D; Thu, 3 Feb 2011 22:27:09 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id D56F49403B; Thu, 3 Feb 2011 22:27:09 +0100 (CET) Date: Thu, 3 Feb 2011 22:27:09 +0100 (CET) From: Jesper Juhl To: netdev@vger.kernel.org cc: linux-drivers@serverengines.com, linux-kernel@vger.kernel.org, Ajit Khaparde , Sarveshwar Bandi , Subbu Seetharaman , Sathya Perla Subject: [PATCH] ServerEngines, benet: Avoid potential null deref in be_cmd_get_seeprom_data() Message-ID: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org wrb_from_mccq() may return null, so we may crash on a null deref in be_cmd_get_seeprom_data(). This avoids that potential crash. Signed-off-by: Jesper Juhl --- be_cmds.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/benet/be_cmds.c b/drivers/net/benet/be_cmds.c index 0c7811f..ec4a21d 100644 --- a/drivers/net/benet/be_cmds.c +++ b/drivers/net/benet/be_cmds.c @@ -1786,6 +1786,8 @@ int be_cmd_get_seeprom_data(struct be_adapter *adapter, spin_lock_bh(&adapter->mcc_lock); wrb = wrb_from_mccq(adapter); + if (!wrb) + return -EBUSY; req = nonemb_cmd->va; sge = nonembedded_sgl(wrb);