From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E5881FCF7D; Fri, 6 Dec 2024 15:19:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733498351; cv=none; b=oocUvs2ZZy/Vr7GSkpeFn1gFecfL6KagaZjIoSZXxjxFPHhNygBBAzztGLry6lAjUtDjdeTxpCf2MA74zOnvzoX6QJi6HQodD50HJ5149d8HIB5s8xY/h2UTJQ8wBLu0mqFSyHdDzDGkTP2iNXCrzNbrcylQ+nlLrp7M29iBmMs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733498351; c=relaxed/simple; bh=x6LdjlNkk7VIqUzZUlaxZluYMRhY25b4CFBsC2zmBB4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ks8Rn1diLFOB+q0CexodXd47eBvLNl4/s7/oyIKAu8wJqxf1LnBebomxE6265zp85q7oZ2mOPw2P5Tu3L0DjIzwi7lR3dr6/D4X7VwgYYyMXgZ3JXriKMwAD3YUjPgjcsM4P8ZXiEsYyleToaBJ/DvD2H+bsHqQeoBJb3ZBfsOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=usXQxlok; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="usXQxlok" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F080EC4CEDC; Fri, 6 Dec 2024 15:19:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733498351; bh=x6LdjlNkk7VIqUzZUlaxZluYMRhY25b4CFBsC2zmBB4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=usXQxlokJOby2yLTpXeJJdqneNuV4W0yTqvqR/9+OZRvtOs8k5sN8C8XUIyRy4Kbt fYGBxieDSVzdkw96qrIqm9QhJygcv5/s/8JdfkegS/pkYD5CtIY8wodDdENj116DFY uKfaeUkh39HKhtdAd+wqRKu5wbEfNQCVpSWYY8q4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dan Carpenter , Jeff Layton , Chuck Lever Subject: [PATCH 6.6 552/676] NFSD: Prevent a potential integer overflow Date: Fri, 6 Dec 2024 15:36:11 +0100 Message-ID: <20241206143714.928900453@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241206143653.344873888@linuxfoundation.org> References: <20241206143653.344873888@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chuck Lever commit 7f33b92e5b18e904a481e6e208486da43e4dc841 upstream. If the tag length is >= U32_MAX - 3 then the "length + 4" addition can result in an integer overflow. Address this by splitting the decoding into several steps so that decode_cb_compound4res() does not have to perform arithmetic on the unsafe length value. Reported-by: Dan Carpenter Cc: stable@vger.kernel.org Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4callback.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -297,17 +297,17 @@ static int decode_cb_compound4res(struct u32 length; __be32 *p; - p = xdr_inline_decode(xdr, 4 + 4); + p = xdr_inline_decode(xdr, XDR_UNIT); if (unlikely(p == NULL)) goto out_overflow; - hdr->status = be32_to_cpup(p++); + hdr->status = be32_to_cpup(p); /* Ignore the tag */ - length = be32_to_cpup(p++); - p = xdr_inline_decode(xdr, length + 4); - if (unlikely(p == NULL)) + if (xdr_stream_decode_u32(xdr, &length) < 0) + goto out_overflow; + if (xdr_inline_decode(xdr, length) == NULL) + goto out_overflow; + if (xdr_stream_decode_u32(xdr, &hdr->nops) < 0) goto out_overflow; - p += XDR_QUADLEN(length); - hdr->nops = be32_to_cpup(p); return 0; out_overflow: return -EIO;