From patchwork Thu Mar 22 07:12:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: santosh nayak X-Patchwork-Id: 148183 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 BFDA2B6EF4 for ; Thu, 22 Mar 2012 18:14:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752882Ab2CVHOO (ORCPT ); Thu, 22 Mar 2012 03:14:14 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47873 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751112Ab2CVHOM (ORCPT ); Thu, 22 Mar 2012 03:14:12 -0400 Received: by pbcun15 with SMTP id un15so1382570pbc.19 for ; Thu, 22 Mar 2012 00:14:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=kANQpB0kQwg5ulxsUIOE/MeAA1obN48xO25jV+RN+4w=; b=uMSjoy2Wcu2cyBR+fytR1GWuqREkQ4xrZkSnzjdcu1jKijCZ21Md3QeGONA3U3cQKD zhdgD8yRewGOrPuOSZIM2uBJ+PApTKGsvuLjc3NgCzzqeSbUUENKX4Xd/COR7kVFnz/x TrMsrnX0wxSeVQD84ssM96MaeC5a1q8dq14gQU/rbGiLgwXDtfdz14Qa2asIbPfUsucm SXcFbSv6t9Pw2pbb187imW4ohJkrWYeoS/4hIAJ9ccOcN/QbNpcTWNWkpreBdB38DD8b T0PAMVQsqSFaqid/y9A9CXPyO9hBL+Tj3jgmfIdVtlHlwnLshYfZ6j9r4fcvvyRgcJbu +0YQ== Received: by 10.68.216.98 with SMTP id op2mr18356124pbc.93.1332400451611; Thu, 22 Mar 2012 00:14:11 -0700 (PDT) Received: from localhost.localdomain ([64.103.156.72]) by mx.google.com with ESMTPS id w6sm3179729pbf.66.2012.03.22.00.14.08 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 00:14:11 -0700 (PDT) From: santosh nayak To: linville@tuxdriver.com Cc: davem@davemloft.net, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, kernel-janitors@vger.kernel.org, Santosh Nayak Subject: [PATCH 3/3] net: orinoco: add error handling for failed kmalloc(). Date: Thu, 22 Mar 2012 12:42:41 +0530 Message-Id: <1332400361-11176-1-git-send-email-santoshprasadnayak@gmail.com> X-Mailer: git-send-email 1.7.4.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Santosh Nayak With flag 'GFP_ATOMIC', probability of allocation failure is more. Add error handling after kmalloc() call to avoid null dereference. Signed-off-by: Santosh Nayak --- drivers/net/wireless/orinoco/main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c index dd6c64a..24a768b 100644 --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c @@ -1336,6 +1336,10 @@ static void qbuf_scan(struct orinoco_private *priv, void *buf, unsigned long flags; sd = kmalloc(sizeof(*sd), GFP_ATOMIC); + if (!sd) { + printk(KERN_ERR "%s: failed to alloc memory\n", __func__); + return; + } sd->buf = buf; sd->len = len; sd->type = type; @@ -1353,6 +1357,10 @@ static void qabort_scan(struct orinoco_private *priv) unsigned long flags; sd = kmalloc(sizeof(*sd), GFP_ATOMIC); + if (!sd) { + printk(KERN_ERR "%s: failed to alloc memory\n", __func__); + return; + } sd->len = -1; /* Abort */ spin_lock_irqsave(&priv->scan_lock, flags);