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 10F7318F2FD; Mon, 28 Oct 2024 06:35:19 +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=1730097319; cv=none; b=QntlNBx0vqnbwwNLa7tAJvLAF2Im8VV0D7mDXRccicwdKDz0D5AkNm0lSbe56Am8cpC9/Y03jmXTlXYx944KaEHYM8UbMxjdUkqCbcPkoqmKPLHZRQZn+6Nq+XnZo7UB2xqS2/e/WTG2Qu6eV+Rh0piWhLUWl/O24k04S4HUbrM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730097319; c=relaxed/simple; bh=YLh2/V7y3hSvFwXOyx04GL5/eh2U1NxgyYhUQaV3u5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tj8AqdaEjX0r2ZurGTqnzV6bUy26f25O/CWvJMxWXGDc1ZqmISdBvldkUOIjrVXMlifIrd/NH+QciW7TsvkmFv0bCxEA/7nhP8m/N8Cvj8trQyDIrWlolRtli2TCKR0J9yCOeNs3j5LjGMouGOfRk3DgZ5MIA/V8iLvy9u9AYdg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VZmGKMfM; 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="VZmGKMfM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A5F2BC4CEC3; Mon, 28 Oct 2024 06:35:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730097318; bh=YLh2/V7y3hSvFwXOyx04GL5/eh2U1NxgyYhUQaV3u5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VZmGKMfMvvR2yJX+4NT0NGifE+tjAV3rDBdhCvvguPs9QgklRsQJqmE137tNAOP+J sr9m9i/J8uYFVzlzcTnrxufdhqcfGlxOOtz4tsO8xy1aTwUZRBIYR3us756GoF2HjR 8igdg2KF9gmYfM61y8yYFcSY4UA+DXH0TpHwBSLM= 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.1 079/137] udf: fix uninit-value use in udf_get_fileshortad Date: Mon, 28 Oct 2024 07:25:16 +0100 Message-ID: <20241028062300.944460806@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241028062258.708872330@linuxfoundation.org> References: <20241028062258.708872330@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.1-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 fac28caca356a..d7d6ccd0af064 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -2107,12 +2107,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