From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048060; b=MqqyV2GXpmf7AXHmD44KLWMdWt0K34QODwyFPiKFx3K5UzVv3VAi0tzlpZgG3w9x+Dfo 8g60TQWx9vT8CmKk5C6TwHEDXaTc3bh0ue6+l7tVKR5JlB1nqMx0FhiAfbJfCdIApf18P pY1TLrtISX2s5JSr/A+At/7hkbiU0i0xaZUs/bDlHgwPre540amKFiYIfNmwW2DJ33lLu uQEFad47o/f+d3Gg4XyL1CNcqsFfuO7REuakGoQrcLnycy8DQDmcpN9SIGQxMQ2xI2JVp 1nYMjZaqQM82/UCsQWiavtjELqQZhvB3vIQDd4nseWbkGmOhP7KeZpNUfgeudvMxwXg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048060; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=ecNrNGc2y+KLvuvZaMYuvclbg/kZeY9rvgKyW+8/rl8=; b=gM+xUBe1e/cXi2tZAQShzIWs34k5urQrw4N94u89mIG4oxo9MSfL4dyphpNLHSQzG71b LEM4x5qg1avxGZo03erNz7z8hbNg7hk0jLDcNBbTDVGq3e+7VBGebcRR3Lad3XFhwOHwC XIFQjphVJzOIOYSfSzGOPuP2/zQtM51i9nL0unrtetgC5JN4Kt2QgYeLMSRl7h8n8NTHX bddyZboYDUrC3oQmYRTxIBpQ7drl0E9+TZJ/B9SceUpASMTm60TnS5etZ0/WmDLLI+sCy 9g+3tIV4NCasjm/K5c/7WyuYHL5ie2OUq9LaleIjBZye3BPwm7TzWVbVVHvv7lsbaVQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=i4T5aS2r; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A2A1606A32C for ; Sat, 7 Nov 2026 10:41:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=i4T5aS2r Received: by smtp.kernel.org (Postfix) with ESMTPSA id 883FF1F0089F; Sat, 7 Nov 2026 10:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048060; bh=ecNrNGc2y+KLvuvZaMYuvclbg/kZeY9rvgKyW+8/rl8=; h=From:To:Cc:Subject:Date; b=i4T5aS2r6rg+ap1wwBrajkz+xY7JUh5jj4vwhdsQWtTH3D1sqYIUA6XMJe3ifvGyV VyB9hucceKtchDdyDCmAr9bvSYq0ZRUC2WwuKrig7Un4bPZyZ5Ujk/M7m9snc3tppn +6Fn9AnlN8/7zLEaMP3x8jXoQHL8sm/8MxB3JDS1MAa/oV1/ipKAU3rj9Yofq8T8FZ EE8rW3deSIrIPRiFjTux8rstoITWH6XDPxyGooeiYrbEt5oepn4LaFxOJlcpMQzLVm afI93hTph8J4fUX0X9U0n+TIGDpzK6pwWDxmFILpA6uOpQGu38Ro0TNM3/4Ug6dsc5 PsNILJDh0Oibg== From: Sasha Levin To: shionthanatos@gmail.com, gmwgg05@gmail.com, npczmd@qq.com, jupmouse@gmail.com, jack@suse.cz Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] udf: validate the device specification EA before using it" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:40:58 -0500 Message-ID: <20261107054058-failed-6.1-9a2390959685@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 9a2390959685ac35a58c80c8016120849a2babf6 # git commit -s git send-email --to '' --in-reply-to '20261107054058-failed-6.1-9a2390959685@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 9a2390959685ac35a58c80c8016120849a2babf6 Mon Sep 17 00:00:00 2001 From: Yunpeng Tian Date: Mon, 31 Aug 2026 17:31:16 +0200 Subject: [PATCH] udf: validate the device specification EA before using it udf_get_extendedattr() bounds an extended attribute only against struct genericFormat, which is 12 bytes. A type-12 device specification is struct deviceSpec, which is 24 bytes plus a flexible impUse array. Thus a corrupted filesystem can contain extended attribute that is accepted by udf_get_extendedattr() but udf_write_inode() or udf_read_inode() may access beyond the end of provided buffer. Provide a udf_device_spec_valid() check to validate correctness of extended attribute that is a deviceSpec. While here, check the result of udf_add_extendedattr() before dereferencing it as it can return NULL in case of error. [JK: Removed duplicated validity checks] Reported-by: Yunpeng Tian Reported-by: Gongming Wang Reported-by: Mingda Zhang Reported-by: Qinrun Dai Cc: stable@vger.kernel.org Signed-off-by: Yunpeng Tian Signed-off-by: Jan Kara --- fs/udf/inode.c | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index e45e546a739a9..baf9845ac06b0 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1336,6 +1336,26 @@ int udf_setsize(struct inode *inode, loff_t newsize) return err; } +/* + * Verify validity of struct deviceSpec on disk. udf_get_extendedattr() has + * already verified the generic header and made sure attribute fits in the + * inode so we just have to make sure attribute space is large enough for + * deviceSpec struct and required impUse information. + */ +static bool udf_device_spec_valid(struct deviceSpec *dsea) +{ + u32 attr_length, imp_use_length; + + attr_length = le32_to_cpu(dsea->attrLength); + imp_use_length = le32_to_cpu(dsea->impUseLength); + if (attr_length < sizeof(struct deviceSpec) || + imp_use_length < sizeof(struct regid) || + imp_use_length > attr_length - sizeof(struct deviceSpec)) + return false; + + return true; +} + /* * Maximum length of linked list formed by ICB hierarchy. The chosen number is * arbitrary - just that we hopefully don't limit any real use of rewritten @@ -1654,13 +1674,12 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) { struct deviceSpec *dsea = (struct deviceSpec *)udf_get_extendedattr(inode, 12, 1); - if (dsea) { - init_special_inode(inode, inode->i_mode, + + if (!dsea || !udf_device_spec_valid(dsea)) + goto out; + init_special_inode(inode, inode->i_mode, MKDEV(le32_to_cpu(dsea->majorDeviceIdent), le32_to_cpu(dsea->minorDeviceIdent))); - /* Developer ID ??? */ - } else - goto out; } ret = 0; out: @@ -1757,6 +1776,7 @@ int udf_write_inode(struct inode *inode, struct writeback_control *wbc) struct udf_sb_info *sbi = UDF_SB(inode->i_sb); unsigned char blocksize_bits = inode->i_sb->s_blocksize_bits; struct udf_inode_info *iinfo = UDF_I(inode); + int err; bh = sb_getblk(inode->i_sb, udf_get_lb_pblock(inode->i_sb, &iinfo->i_location, 0)); @@ -1821,6 +1841,10 @@ int udf_write_inode(struct inode *inode, struct writeback_control *wbc) udf_add_extendedattr(inode, sizeof(struct deviceSpec) + sizeof(struct regid), 12, 0x3); + if (!dsea) { + err = -ENOSPC; + goto out_unlock; + } dsea->attrType = cpu_to_le32(12); dsea->attrSubtype = 1; dsea->attrLength = cpu_to_le32( @@ -1828,6 +1852,10 @@ int udf_write_inode(struct inode *inode, struct writeback_control *wbc) sizeof(struct regid)); dsea->impUseLength = cpu_to_le32(sizeof(struct regid)); } + if (!udf_device_spec_valid(dsea)) { + err = -EFSCORRUPTED; + goto out_unlock; + } eid = (struct regid *)dsea->impUse; memset(eid, 0, sizeof(*eid)); strcpy(eid->ident, UDF_ID_DEVELOPER); @@ -1962,6 +1990,11 @@ int udf_write_inode(struct inode *inode, struct writeback_control *wbc) set_inode_metadata_writeback(inode); return 0; + +out_unlock: + unlock_buffer(bh); + brelse(bh); + return err; } struct inode *__udf_iget(struct super_block *sb, struct kernel_lb_addr *ino, -- 2.53.0