From patchwork Mon Mar 25 10:57:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fanchaoting X-Patchwork-Id: 2330461 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0C43F3FC54 for ; Mon, 25 Mar 2013 10:58:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757327Ab3CYK57 (ORCPT ); Mon, 25 Mar 2013 06:57:59 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:19634 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1757325Ab3CYK56 (ORCPT ); Mon, 25 Mar 2013 06:57:58 -0400 X-IronPort-AV: E=Sophos;i="4.87,344,1363104000"; d="scan'208";a="6940194" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 25 Mar 2013 18:54:57 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r2PAvSkG030277; Mon, 25 Mar 2013 18:57:28 +0800 Received: from [127.0.0.1] ([10.167.233.142]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013032518564363-31111 ; Mon, 25 Mar 2013 18:56:43 +0800 Message-ID: <51502DB7.1010508@cn.fujitsu.com> Date: Mon, 25 Mar 2013 18:57:59 +0800 From: fanchaoting User-Agent: Thunderbird 2.0.0.9 (Windows/20071031) MIME-Version: 1.0 To: "Myklebust, Trond" , "bfields@fieldses.org" CC: "linux-nfs@vger.kernel.org" Subject: [PATCH] nfs: nfs client decode fslocations oops if server cheating it X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/25 18:56:43, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/03/25 18:56:44, Serialize complete at 2013/03/25 18:56:44 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org now nfs server will return wrong nlocations,nservers, ncomponents to the client. for example if the nlocations is NFS4_FS_LOCATIONS_MAXENTRIES, the nfs client will decode oops when run "struct nfs4_fs_location *loc = &res->locations[res->nlocations]" Signed-off-by: fanchaoting Reviewed-by: chendt.fnst@cn.fujitsu.com --- fs/nfs/nfs4xdr.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index e3edda5..25f1769 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -3496,6 +3496,10 @@ static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path) n = be32_to_cpup(p); if (n == 0) goto root_path; + if (n > NFS4_PATHNAME_MAXCOMPONENTS) { + dprintk("%s: server cheating client ncomponents :%d\n", __func__, n); + goto out_eio; + } dprintk("pathname4: "); path->ncomponents = 0; while (path->ncomponents < n) { @@ -3557,6 +3561,10 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st n = be32_to_cpup(p); if (n <= 0) goto out_eio; + if (n > NFS4_FS_LOCATIONS_MAXENTRIES) { + dprintk("%s: server cheating client nlocations :%d\n", __func__, n); + goto out_eio; + } res->nlocations = 0; while (res->nlocations < n) { u32 m; @@ -3566,7 +3574,10 @@ static int decode_attr_fs_locations(struct xdr_stream *xdr, uint32_t *bitmap, st if (unlikely(!p)) goto out_overflow; m = be32_to_cpup(p); - + if (m > NFS4_FS_LOCATION_MAXSERVERS) { + dprintk("%s: server cheating client nservers :%d\n", __func__, m); + goto out_eio; + } loc->nservers = 0; dprintk("%s: servers:\n", __func__); while (loc->nservers < m) {