From patchwork Wed Jul 1 18:50:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Kulkarni X-Patchwork-Id: 29363 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id E1E8FB70DD for ; Thu, 2 Jul 2009 04:49:50 +1000 (EST) Received: by ozlabs.org (Postfix) id D5C0DDDD1B; Thu, 2 Jul 2009 04:49:50 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5C53DDDD0C for ; Thu, 2 Jul 2009 04:49:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755871AbZGAStX (ORCPT ); Wed, 1 Jul 2009 14:49:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754693AbZGAStW (ORCPT ); Wed, 1 Jul 2009 14:49:22 -0400 Received: from mail-px0-f190.google.com ([209.85.216.190]:63209 "EHLO mail-px0-f190.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755549AbZGAStV (ORCPT ); Wed, 1 Jul 2009 14:49:21 -0400 Received: by mail-px0-f190.google.com with SMTP id 28so1021974pxi.33 for ; Wed, 01 Jul 2009 11:49:25 -0700 (PDT) Received: by 10.141.1.19 with SMTP id d19mr878329rvi.44.1246474165111; Wed, 01 Jul 2009 11:49:25 -0700 (PDT) Received: from localhost.localdomain (y-130-55-115-47.lanl.gov [130.55.115.47]) by mx.google.com with ESMTPS id g22sm6896470rvb.55.2009.07.01.11.49.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 01 Jul 2009 11:49:24 -0700 (PDT) From: Abhishek Kulkarni To: linux-kernel@vger.kernel.org Cc: v9fs-developer@lists.sourceforge.net, Abhishek Kulkarni , netdev@vger.kernel.org Subject: [9P PATCH 2/2] net/9p: Fix crash due to bad mount parameters. Date: Wed, 1 Jul 2009 12:50:54 -0600 Message-Id: <1246474254-10401-2-git-send-email-adkulkar@umail.iu.edu> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1246474254-10401-1-git-send-email-adkulkar@umail.iu.edu> References: <1246474254-10401-1-git-send-email-adkulkar@umail.iu.edu> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is not safe to use match_int without checking the token type returned by match_token (especially when the token type returned is Opt_err and args is empty). Fix it. Signed-off-by: Abhishek Kulkarni --- :100644 100644 c613ed08.. b884d98... M net/9p/trans_fd.c net/9p/trans_fd.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index c613ed0..b884d98 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -731,12 +731,14 @@ static int parse_opts(char *params, struct p9_fd_opts *opts) if (!*p) continue; token = match_token(p, tokens, args); - r = match_int(&args[0], &option); - if (r < 0) { - P9_DPRINTK(P9_DEBUG_ERROR, - "integer field, but no integer?\n"); - ret = r; - continue; + if (token != Opt_err) { + r = match_int(&args[0], &option); + if (r < 0) { + P9_DPRINTK(P9_DEBUG_ERROR, + "integer field, but no integer?\n"); + ret = r; + continue; + } } switch (token) { case Opt_port: