From patchwork Mon Mar 21 17:34:24 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaliy Gusev X-Patchwork-Id: 648421 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 p2LHqO3N021337 for ; Mon, 21 Mar 2011 17:52:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753604Ab1CURwX (ORCPT ); Mon, 21 Mar 2011 13:52:23 -0400 Received: from relay03.bluemeaney.com ([205.234.16.187]:39160 "EHLO relay03.bluemeaney.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751693Ab1CURwW (ORCPT ); Mon, 21 Mar 2011 13:52:22 -0400 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 21 Mar 2011 17:52:24 +0000 (UTC) X-Greylist: delayed 1068 seconds by postgrey-1.27 at vger.kernel.org; Mon, 21 Mar 2011 13:52:22 EDT X-ASG-Debug-ID: 1300728872-25ab2fe00001-suBQlS Received: from sfdc-fe01.bluemeaney.com ([172.28.16.33]) by relay03.bluemeaney.com with ESMTP id oJpTBdJ3Bsq19RE9; Mon, 21 Mar 2011 10:34:32 -0700 (PDT) X-Barracuda-Envelope-From: Gusev.Vitaliy@nexenta.com X-ASG-Whitelist: Client Received: from [172.16.1.215] ([172.28.16.12]) by sfdc-fe01.bluemeaney.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 21 Mar 2011 10:34:31 -0700 Subject: [PATCH] Fix memory corruption due to not expected FS_LOCATIONS v3 X-Barracuda-BBL-IP: 172.16.1.215 X-Barracuda-RBL-IP: 172.16.1.215 From: Vitaliy Gusev X-ASG-Orig-Subj: [PATCH] Fix memory corruption due to not expected FS_LOCATIONS v3 To: Trond Myklebust Cc: Al Viro , linux-nfs@vger.kernel.org, David Howells In-Reply-To: <1297338894.3667.0.camel@vT510> References: <1297338894.3667.0.camel@vT510> Date: Mon, 21 Mar 2011 20:34:24 +0300 Message-ID: <1300728864.6113.13.camel@vT510> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 X-OriginalArrivalTime: 21 Mar 2011 17:34:32.0226 (UTC) FILETIME=[3D068020:01CBE7EE] X-Barracuda-Connect: UNKNOWN[172.28.16.33] X-Barracuda-Start-Time: 1300728872 X-Barracuda-URL: http://spam.bluemeaney.com:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at bluemeaney.com Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index c87e543..6fea9c9 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -3451,7 +3451,8 @@ out_overflow: return -EIO; } -static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res) +static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, struct nfs4_fs_locations *res, + uint32_t *deny_bitmap) {