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=1795053755; b=f1PSYrJCvfZbVsGwxszvjMf987j9L6UzG47cuer2gTm+onzHkU3q9mdUHoprEyxejcQa p87zOxkSUqIqMRDFwgOPrOlBDkcqDa1uDASobHPXqSK3NwBbRztNq5NLzT5cPMM5TsLc6 AEPhVNFKDLm5V8iITrD8cSqrGcyWWI8J1n9Seos6loW93eHFVNb8E4bnAmIA07g4goo61 6W4wJHnXKpN62vD4SHUwZ4MwvG7EF/KB0aX/T3vjzejOI9Ii0bDiruZ9dHoOUQV3ASvcO StMIaTuTePgwZ1FFVdwiQjTlC/FvoV9hWigDK0HddQEmswk4DQlkTcV02VledIGKtNw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795053755; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zoPbIoYEsFpFMJlyKq6IVeH3KbTXELNQxcy8NMn0tVc=; b=l+ZmCwjPZwn6PA9GRf/mC6vfcpUSfMl79UrnzZPbGT/1lY+9HBo893OrVN30Yp8Y+lfb SCigcJIlisEuNyXrnNynrCxBuYYVE2j8jGvAgjYJPS9YOiRukePsGIqX5O/UCJLhzjlmv Nm1yeN2dEWXPZeJyiuJFZOcqCjEoHrPFtUjnR5rh4WmDntTCYoS2z6N7QIrfMzTu4dvNh iFSElrlm1T0EnzvidzcxCOOT88ldSV/bZk6vM3lc1mJzgCauM7mlXxOAGlyLa2aeBOQoV g56FZfHr6aGS8Rw3TbhLaZ03nTjSqoLmH4u4L03hjkuwoMxZQEzvJlBXtdjaXpwTAcw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="JcqBeR/c"; 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 BD0C0606A31C; Thu, 19 Nov 2026 02:02:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=JcqBeR/c Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1FEBE1F000C4; Thu, 19 Nov 2026 02:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795053755; bh=zoPbIoYEsFpFMJlyKq6IVeH3KbTXELNQxcy8NMn0tVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JcqBeR/ckqwMZZB2stS8vtNCLisQlITQFkmFpuu+wIa8IlSsRt70x1vm7VuN7J6TB ZRZceyhZlghSpcMxIMjlm5ZCLq2srF9STV+fxCWoEkN4B+8riZ/ZxwX84j/2280WO1 1MOALKaSb8zsWR1UBp7XIS0L7ef5qQnoJCI3tS90= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yunpeng Tian , Gongming Wang , Mingda Zhang , Qinrun Dai , Jan Kara , Sasha Levin Subject: [PATCH 5.15 1032/2214] udf: validate the device specification EA before using it Date: Wed, 18 Nov 2026 15:45:08 +0100 Message-ID: <20261118150053.604647212@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yunpeng Tian [ Upstream commit 9a2390959685ac35a58c80c8016120849a2babf6 ] 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 [ sashal: adapted udf_write_inode() changes to the existing udf_update_inode() implementation ] Signed-off-by: Sasha Levin --- fs/udf/inode.c | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 4419070d5008a..e3a201df9b76c 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1194,6 +1194,26 @@ int udf_setsize(struct inode *inode, loff_t newsize) return 0; } +/* + * 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 @@ -1508,13 +1528,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: @@ -1662,6 +1681,10 @@ static int udf_update_inode(struct inode *inode, int do_sync) 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( @@ -1669,6 +1692,10 @@ static int udf_update_inode(struct inode *inode, int do_sync) 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); @@ -1808,6 +1835,11 @@ static int udf_update_inode(struct inode *inode, int do_sync) brelse(bh); return err; + +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