From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934142Ab1KCBjL (ORCPT ); Wed, 2 Nov 2011 21:39:11 -0400 Received: from cantor2.suse.de ([195.135.220.15]:51027 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934042Ab1KCBjG (ORCPT ); Wed, 2 Nov 2011 21:39:06 -0400 X-Mailbox-Line: From gregkh@clark.kroah.org Wed Nov 2 15:27:41 2011 Message-Id: <20111102222741.573857486@clark.kroah.org> User-Agent: quilt/0.48-16.4 Date: Wed, 02 Nov 2011 15:26:05 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, =?ISO-8859-15?q?Venkateswararao=20Jujjuri=20@suse.de, "?= , "@suse.de, Aneesh@suse.de, Kumar@suse.de, K.V@suse.de, " , Eric Van Hensbergen "@suse.de Subject: [021/101] net/9p: Fix the msize calculation. In-Reply-To: <20111102222755.GA10893@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.33-longterm review patch. If anyone has any objections, please let us know. ------------------ From: "Venkateswararao Jujjuri (JV)" commit c9ffb05ca5b5098d6ea468c909dd384d90da7d54 upstream. msize represents the maximum PDU size that includes P9_IOHDRSZ. Signed-off-by: Venkateswararao Jujjuri " Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen Signed-off-by: Greg Kroah-Hartman --- net/9p/client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/net/9p/client.c +++ b/net/9p/client.c @@ -708,8 +708,8 @@ struct p9_client *p9_client_create(const if (err) goto destroy_fidpool; - if ((clnt->msize+P9_IOHDRSZ) > clnt->trans_mod->maxsize) - clnt->msize = clnt->trans_mod->maxsize-P9_IOHDRSZ; + if (clnt->msize > clnt->trans_mod->maxsize) + clnt->msize = clnt->trans_mod->maxsize; err = p9_client_version(clnt); if (err)