From patchwork Fri Aug 26 16:55:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 111808 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 2AF2DB6F99 for ; Sat, 27 Aug 2011 02:58:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752179Ab1HZQ6U (ORCPT ); Fri, 26 Aug 2011 12:58:20 -0400 Received: from mail-qy0-f181.google.com ([209.85.216.181]:51036 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751032Ab1HZQ6T (ORCPT ); Fri, 26 Aug 2011 12:58:19 -0400 Received: by qyk34 with SMTP id 34so2427960qyk.19 for ; Fri, 26 Aug 2011 09:58:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=xSSeQYtH4uPXcZMRmxGMSlxIKY06ofrp47tZ4L6iKJY=; b=thGNjTJo6yoLQ5MqzdHJNBUzeGvmxz2qsS3f648Fz5gkoREacGS491Ct1qRDPNy4Un zWEHo6ywhoPk5YqpAjVcWfivhpUxzhEHOqr2SBysxfsYFU3Lou+BqGx/TuepIYSL6rNL ULzDPdwYtaVDvQxbtOwGhupL7z+7Px/zmB7t0= Received: by 10.142.139.1 with SMTP id m1mr658912wfd.148.1314377897881; Fri, 26 Aug 2011 09:58:17 -0700 (PDT) Received: from shale.localdomain ([41.139.221.94]) by mx.google.com with ESMTPS id i3sm608478wfg.18.2011.08.26.09.58.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 26 Aug 2011 09:58:17 -0700 (PDT) Date: Fri, 26 Aug 2011 19:55:59 +0300 From: Dan Carpenter To: Eric Van Hensbergen Cc: "David S. Miller" , Venkateswararao Jujjuri , "Aneesh Kumar K.V" , "M. Mohan Kumar" , "open list:NETWORKING [GENERAL]" , kernel-janitors@vger.kernel.org Subject: [patch 1/2] 9p: move dereference after NULL check Message-ID: <20110826165559.GE3775@shale.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We dereferenced "req->tc" and "req->rc" before checking for NULL. Signed-off-by: Dan Carpenter Reviewed-by: Aneesh Kumar K.V Reviewed-by: Venkateswararao Jujjuri --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/9p/client.c b/net/9p/client.c index 3f8c046..b0bcace 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -248,10 +248,8 @@ static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag, int max_size) init_waitqueue_head(req->wq); req->tc = kmalloc(sizeof(struct p9_fcall) + alloc_msize, GFP_NOFS); - req->tc->capacity = alloc_msize; req->rc = kmalloc(sizeof(struct p9_fcall) + alloc_msize, GFP_NOFS); - req->rc->capacity = alloc_msize; if ((!req->tc) || (!req->rc)) { printk(KERN_ERR "Couldn't grow tag array\n"); kfree(req->tc); @@ -261,6 +259,8 @@ static struct p9_req_t *p9_tag_alloc(struct p9_client *c, u16 tag, int max_size) req->wq = NULL; return ERR_PTR(-ENOMEM); } + req->tc->capacity = alloc_msize; + req->rc->capacity = alloc_msize; req->tc->sdata = (char *) req->tc + sizeof(struct p9_fcall); req->rc->sdata = (char *) req->rc + sizeof(struct p9_fcall); }