From patchwork Wed Jul 29 19:49:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Kulkarni X-Patchwork-Id: 30372 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 62BA3B7B6B for ; Thu, 30 Jul 2009 05:55:02 +1000 (EST) Received: by ozlabs.org (Postfix) id 57BB2DDD1B; Thu, 30 Jul 2009 05:55:02 +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 D244FDDD0B for ; Thu, 30 Jul 2009 05:55:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754415AbZG2Tyh (ORCPT ); Wed, 29 Jul 2009 15:54:37 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754378AbZG2Tyh (ORCPT ); Wed, 29 Jul 2009 15:54:37 -0400 Received: from rv-out-0506.google.com ([209.85.198.238]:15357 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754362AbZG2Tyg (ORCPT ); Wed, 29 Jul 2009 15:54:36 -0400 Received: by rv-out-0506.google.com with SMTP id f6so275622rvb.1 for ; Wed, 29 Jul 2009 12:54:36 -0700 (PDT) Received: by 10.141.29.16 with SMTP id g16mr136537rvj.214.1248896953922; Wed, 29 Jul 2009 12:49:13 -0700 (PDT) Received: from localhost.localdomain (y-130-55-115-47.lanl.gov [130.55.115.47]) by mx.google.com with ESMTPS id g14sm4027967rvb.30.2009.07.29.12.49.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 29 Jul 2009 12:49:13 -0700 (PDT) From: Abhishek Kulkarni To: v9fs-developer@lists.sourceforge.net Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [RESEND 2/2] net/9p: Insulate the client against an invalid error code sent by a 9p server. Date: Wed, 29 Jul 2009 13:49:02 -0600 Message-Id: <1248896942-13027-2-git-send-email-adkulkar@umail.iu.edu> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1248896942-13027-1-git-send-email-adkulkar@umail.iu.edu> References: <1248896942-13027-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 A looney tunes server sending an invalid error code (which is !IS_ERR_VALUE) can result in a client oops. So fix it by adding a check and converting unknown or invalid error codes to -ESERVERFAULT. Signed-off-by: Abhishek Kulkarni --- :100644 100644 7bbd2d5... 5bf5f22... M net/9p/client.c :100644 100644 fdebe43... 5251851... M net/9p/error.c net/9p/client.c | 7 +------ net/9p/error.c | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/net/9p/client.c b/net/9p/client.c index 7bbd2d5..5bf5f22 100644 --- a/net/9p/client.c +++ b/net/9p/client.c @@ -411,14 +411,9 @@ static int p9_check_errors(struct p9_client *c, struct p9_req_t *req) if (c->dotu) err = -ecode; - if (!err) { + if (!err || !IS_ERR_VALUE(err)) err = p9_errstr2errno(ename, strlen(ename)); - /* string match failed */ - if (!err) - err = -ESERVERFAULT; - } - P9_DPRINTK(P9_DEBUG_9P, "<<< RERROR (%d) %s\n", -ecode, ename); kfree(ename); diff --git a/net/9p/error.c b/net/9p/error.c index fdebe43..5251851 100644 --- a/net/9p/error.c +++ b/net/9p/error.c @@ -239,7 +239,7 @@ int p9_errstr2errno(char *errstr, int len) errstr[len] = 0; printk(KERN_ERR "%s: server reported unknown error %s\n", __func__, errstr); - errno = 1; + errno = ESERVERFAULT; } return -errno;