From patchwork Tue May 9 21:03:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 9718975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 28E1360237 for ; Tue, 9 May 2017 21:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ABF128419 for ; Tue, 9 May 2017 21:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F48E284D4; Tue, 9 May 2017 21:04:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE6D828419 for ; Tue, 9 May 2017 21:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750751AbdEIVDv (ORCPT ); Tue, 9 May 2017 17:03:51 -0400 Received: from fieldses.org ([173.255.197.46]:59168 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750710AbdEIVDv (ORCPT ); Tue, 9 May 2017 17:03:51 -0400 Received: by fieldses.org (Postfix, from userid 2815) id 84F2123ED; Tue, 9 May 2017 17:03:50 -0400 (EDT) Date: Tue, 9 May 2017 17:03:50 -0400 From: "J . Bruce Fields" To: Dan Carpenter Cc: Colin King , Ari Kauppi , Jeff Layton , linux-nfs@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] nfsd: avoid out of bounds read on array nfsd4_layout_ops Message-ID: <20170509210350.GD6289@fieldses.org> References: <20170509133121.26529-1-colin.king@canonical.com> <20170509140414.ycw4z6zsdevbkozm@mwanda> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20170509140414.ycw4z6zsdevbkozm@mwanda> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Tue, May 09, 2017 at 05:04:14PM +0300, Dan Carpenter wrote: > On Tue, May 09, 2017 at 02:31:21PM +0100, Colin King wrote: > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > > index 1dbf62190bee..c453a1998e00 100644 > > --- a/fs/nfsd/nfs4proc.c > > +++ b/fs/nfsd/nfs4proc.c > > @@ -1259,7 +1259,8 @@ nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type) > > return NULL; > > } > > > > - if (layout_type >= 32 || !(exp->ex_layout_types & (1 << layout_type))) { > > + if (layout_type >= LAYOUT_TYPE_MAX || > > + !(exp->ex_layout_types & (1 << layout_type))) { > > The 32 is there to prevent a shift wrapping bug. The bit test prevents > a buffer overflow so this can't actually overflow. Yes, looks like a false positive for coverity. > But this change doesn't hurt and is probably cleaner. Sure. Hope it's OK if I just merge this into the previous commit: --b. commit 16b6f81d8ed9 Author: Ari Kauppi Date: Fri May 5 16:07:55 2017 -0400 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 Signed-off-by: Ari Kauppi [colin.king@canonical.com: use LAYOUT_TYPE_MAX instead of 32] Reviewed-by: Dan Carpenter Signed-off-by: J. Bruce Fields --- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index d86031b6ad79..c453a1998e00 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -1259,7 +1259,8 @@ nfsd4_layout_verify(struct svc_export *exp, unsigned int layout_type) return NULL; } - if (!(exp->ex_layout_types & (1 << layout_type))) { + if (layout_type >= LAYOUT_TYPE_MAX || + !(exp->ex_layout_types & (1 << layout_type))) { dprintk("%s: layout type %d not supported\n", __func__, layout_type); return NULL;