From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F35C0C4360C for ; Thu, 10 Oct 2019 08:46:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C1C4C208C3 for ; Thu, 10 Oct 2019 08:46:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697190; bh=Psok01rb9VQ9VEznPEyjc5+rXwjlQFDg2BvagxWZhyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KcWRWrBwpL9iO50wi01QQ2gA6lwDKY+aL26+nZ102/vJ6ykQ1C/SDNeMe+aAu92V7 DrmI/KjjGFoG8qMi/FdDo494MzvX2VrAEmH1pU6Dp8IhrHsHlk0nPaRWpYQo1BUcLo Y3UmE5KhtjlrQ93KOyqiqEjL0a4tSkijX6uiC05E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387769AbfJJIq3 (ORCPT ); Thu, 10 Oct 2019 04:46:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:52278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389325AbfJJIq2 (ORCPT ); Thu, 10 Oct 2019 04:46:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 35DDC2064A; Thu, 10 Oct 2019 08:46:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570697187; bh=Psok01rb9VQ9VEznPEyjc5+rXwjlQFDg2BvagxWZhyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJiEOZ7hC5Cp1pRrxSWsN0euzItOlEDt5TdeycjNMlx6UeU/SP2UlaEk9Z3ZneCVY V9KWEQhO2uoh7+uAh4vqnCqjx/eKQoXBVgCyYKrrQdRmo0z172b80E6Yx0vByC09Ao xWeaAtOfL16efQLJTFL8DlscsRyph7xamhQoqtoI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jia-Ju Bai , Anna Schumaker , Sasha Levin Subject: [PATCH 4.19 051/114] fs: nfs: Fix possible null-pointer dereferences in encode_attrs() Date: Thu, 10 Oct 2019 10:35:58 +0200 Message-Id: <20191010083608.189387989@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191010083544.711104709@linuxfoundation.org> References: <20191010083544.711104709@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jia-Ju Bai [ Upstream commit e2751463eaa6f9fec8fea80abbdc62dbc487b3c5 ] In encode_attrs(), there is an if statement on line 1145 to check whether label is NULL: if (label && (attrmask[2] & FATTR4_WORD2_SECURITY_LABEL)) When label is NULL, it is used on lines 1178-1181: *p++ = cpu_to_be32(label->lfs); *p++ = cpu_to_be32(label->pi); *p++ = cpu_to_be32(label->len); p = xdr_encode_opaque_fixed(p, label->label, label->len); To fix these bugs, label is checked before being used. These bugs are found by a static analysis tool STCheck written by us. Signed-off-by: Jia-Ju Bai Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/nfs4xdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index b7bde12d8cd51..1c0227c78a7bc 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c @@ -1171,7 +1171,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, } else *p++ = cpu_to_be32(NFS4_SET_TO_SERVER_TIME); } - if (bmval[2] & FATTR4_WORD2_SECURITY_LABEL) { + if (label && (bmval[2] & FATTR4_WORD2_SECURITY_LABEL)) { *p++ = cpu_to_be32(label->lfs); *p++ = cpu_to_be32(label->pi); *p++ = cpu_to_be32(label->len); -- 2.20.1