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 6C2A415B10D; Mon, 28 Oct 2024 06:42:12 +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=1730097732; cv=none; b=kIAiVAcpAGfWsoLdSnPckB+PLPOuydYgP95fGbaB+8xwib+zJhx4jZyoaT0hyn2alwDcs7DHbhGkkqVlTY/v+qj2537fRH4vpTWo9hBuVk+sLMB2v6dorwCTdK9dBI7IEPLcp7iz4t1bSxME8z4+pRnBWDNJcvdvjtpu504Llvs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097732; c=relaxed/simple; bh=Hrr+IzxSyYa1ziVBP/cTGUGLL/jgO9w48/trRYFU8P4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DdZV0oYGsqPEmVUtvErsIzQWYknY6qeMNs/atEaYQeHkkvcUTwbCYIpt3AVigsGFcrTGR77mkWUyKQ8l6jpM1m/t8ATKc7ShRZuuY3HrnTB1lydnRL9f1+zr9R5XHyP+QQTkVndmC2ZfDwZ8de3xxu4pfo5rfR4T7pXbNeoWR14= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Cb1XruAZ; 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="Cb1XruAZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B585C4CEC3; Mon, 28 Oct 2024 06:42:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097732; bh=Hrr+IzxSyYa1ziVBP/cTGUGLL/jgO9w48/trRYFU8P4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cb1XruAZYRi125jn1GUz2JGobG+dViQVGIKdvH8Lb9yaKJ6h68+ve6Swe5zJu/1Ca /4M/xp/jwmEMY/6x0MvSSHMEq6PwOZvy5XhXlcstc8p1JtDc/fBpSOUx1NHtyEPJrO StI8DoX1wB8Ve6e8smhg03nPXVFccd+4vyxHLk7w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com, Jan Kara , Gianfranco Trad , Jan Kara , Sasha Levin Subject: [PATCH 6.6 123/208] udf: fix uninit-value use in udf_get_fileshortad Date: Mon, 28 Oct 2024 07:25:03 +0100 Message-ID: <20241028062309.676313212@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062306.649733554@linuxfoundation.org> References: <20241028062306.649733554@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Gianfranco Trad [ Upstream commit 264db9d666ad9a35075cc9ed9ec09d021580fbb1 ] Check for overflow when computing alen in udf_current_aext to mitigate later uninit-value use in udf_get_fileshortad KMSAN bug[1]. After applying the patch reproducer did not trigger any issue[2]. [1] https://syzkaller.appspot.com/bug?extid=8901c4560b7ab5c2f9df [2] https://syzkaller.appspot.com/x/log.txt?x=10242227980000 Reported-by: syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=8901c4560b7ab5c2f9df Tested-by: syzbot+8901c4560b7ab5c2f9df@syzkaller.appspotmail.com Suggested-by: Jan Kara Signed-off-by: Gianfranco Trad Signed-off-by: Jan Kara Link: https://patch.msgid.link/20240925074613.8475-3-gianf.trad@gmail.com Signed-off-by: Sasha Levin --- fs/udf/inode.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 37fa27136fafb..e98c198f85b96 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -2255,12 +2255,15 @@ int udf_current_aext(struct inode *inode, struct extent_position *epos, alen = udf_file_entry_alloc_offset(inode) + iinfo->i_lenAlloc; } else { + struct allocExtDesc *header = + (struct allocExtDesc *)epos->bh->b_data; + if (!epos->offset) epos->offset = sizeof(struct allocExtDesc); ptr = epos->bh->b_data + epos->offset; - alen = sizeof(struct allocExtDesc) + - le32_to_cpu(((struct allocExtDesc *)epos->bh->b_data)-> - lengthAllocDescs); + if (check_add_overflow(sizeof(struct allocExtDesc), + le32_to_cpu(header->lengthAllocDescs), &alen)) + return -1; } switch (iinfo->i_alloc_type) { -- 2.43.0