From: Ari Kauppi <ari@synopsys.com>
Date: Fri, 5 May 2017 20:07:55 +0000 (-0400)
Subject: nfsd: fix undefined behavior in nfsd4_layout_verify
X-Git-Tag: v4.1.12-108.0.20170806_1300~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a7705157664b489cd280b5ab1c384ede66043ed1;p=users%2Fjedix%2Flinux-maple.git

nfsd: fix undefined behavior in nfsd4_layout_verify

  UBSAN: Undefined behaviour in fs/nfsd/nfs4proc.c:1262:34
  shift exponent 128 is too large for 32-bit type 'int'

Depending on compiler+architecture, this may cause the check for
layout_type to succeed for overly large values (which seems to be the
case with amd64). The large value will be later used in de-referencing
nfsd4_layout_ops for function pointers.

Reported-by: Jani Tuovila <tuovila@synopsys.com>
Signed-off-by: Ari Kauppi <ari@synopsys.com>
[colin.king@canonical.com: use LAYOUT_TYPE_MAX instead of 32]
Cc: stable@vger.kernel.org
Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
(cherry picked from commit b550a32e60a4941994b437a8d662432a486235a5)

Orabug: 26376568
CVE: CVE-2017-8797

Signed-off-by: Kirtikar Kashyap <kirtikar.kashyap@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>

 Conflicts:
	fs/nfsd/nfs4proc.c
---

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 2b50bc0c545e0..75cca7e38ce2a 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1194,7 +1194,8 @@ nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type)
 		return NULL;
 	}
 
-	if (exp->ex_layout_type != layout_type) {
+	if (layout_type >= LAYOUT_TYPE_MAX || 
+	    (exp->ex_layout_type != layout_type)) {
 		dprintk("%s: layout type %d not supported\n",
 			__func__, layout_type);
 		return NULL;