From patchwork Thu Dec 9 10:12:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 393702 X-Patchwork-Delegate: Trond.Myklebust@netapp.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB9ACuHl005115 for ; Thu, 9 Dec 2010 10:12:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755939Ab0LIKMy (ORCPT ); Thu, 9 Dec 2010 05:12:54 -0500 Received: from adelie.canonical.com ([91.189.90.139]:37749 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755216Ab0LIKMx (ORCPT ); Thu, 9 Dec 2010 05:12:53 -0500 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1PQdUW-0001cQ-Va; Thu, 09 Dec 2010 10:12:48 +0000 Received: from p5b2e4db5.dip.t-dialin.net ([91.46.77.181] helo=[192.168.2.121]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1PQdUW-00062E-OR; Thu, 09 Dec 2010 10:12:48 +0000 Message-ID: <4D00AB9F.3030808@canonical.com> Date: Thu, 09 Dec 2010 11:12:47 +0100 From: Stefan Bader User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Lightning/1.0b1 Thunderbird/3.0.10 MIME-Version: 1.0 To: Chuck Lever CC: Trond Myklebust , Linux NFS Mailing List , Andrew Morton Subject: Re: [Bug 24302] Kernel crashes when repeatedly trying to mount nfs share that is failing References: <201012081830.oB8IUZ4t027387@demeter2.kernel.org> <1291835010.3067.4.camel@heimdal.trondhjem.org> <3F9D016C-9EDF-4B65-AD77-F225D5F1FA66@oracle.com> In-Reply-To: X-Enigmail-Version: 1.0.1 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 10:12:57 +0000 (UTC) From dcc0a9d5d9490680ea9faa7b90de3224c3aba7e3 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Wed, 8 Dec 2010 19:07:12 -0500 Subject: [PATCH] NFS: Fix panic after nfs_umount() After a few unsuccessful NFS mount attempts in which the client and server cannot agree on an authentication flavor both support, the client panics. nfs_umount() is invoked in the kernel in this case. Turns out this particular UMNT RPC invocation causes the RPC client to write off the end of the rpc_clnt's iostat array. This is because the mount client's nrprocs field is initialized with the count of defined procedures (two: MNT and UMNT), rather than the size of the client's proc array (four). The fix is to use the same initialization technique used by most other upper layer clients in the kernel. Introduced by commit 0b524123, which failed to update nrprocs when it added support for UMNT. BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=24302 BugLink: http://bugs.launchpad.net/bugs/683938 Reported-by: Stefan Bader Tested-by: Stefan Bader CC: stable@kernel.org # >= 2.6.32 Signed-off-by: Chuck Lever --- fs/nfs/mount_clnt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/mount_clnt.c b/fs/nfs/mount_clnt.c index 59047f8..50552c5 100644 --- a/fs/nfs/mount_clnt.c +++ b/fs/nfs/mount_clnt.c @@ -503,13 +503,13 @@ static struct rpc_procinfo mnt3_procedures[] = { static struct rpc_version mnt_version1 = { .number = 1, - .nrprocs = 2, + .nrprocs = ARRAY_SIZE(mnt_procedures), .procs = mnt_procedures, }; static struct rpc_version mnt_version3 = { .number = 3, - .nrprocs = 2, + .nrprocs = ARRAY_SIZE(mnt_procedures), .procs = mnt3_procedures, }; -- 1.7.0.4