From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4188824EA90 for ; Sat, 30 May 2026 14:35:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780151734; cv=none; b=Ep+x7RSk1w+jG26iKeAbGBkmcFKoya7Tbe36HhUh/8CtjkDVzNiwvMzdf9z+72OQCzHQ2hiyjKHLgNkXAUXjxpGiYYKfMGijRDCoQEpJ12OPIYv077L3+vLLQ0geFyhCuwLb1pByn67gAheCLvpe5WCLjKR5w5gw5EczchFId/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780151734; c=relaxed/simple; bh=ijOuRHPAqJHZAughCM9VYDQ6TyLb0FcaeFQA6fy4rEs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NCfI25TgGgfCvQXpZfkUQeu9TbgsfEhSVykghjCpwWrklvKYIL0hqWkGuTJ421jn8VQTDBh4m4upolJILX4f5Qc86HRlP0WIeIyABmHuNafn1Fm0EXswmkHHGIMkIPtXa30XFBrtEe4QjlVioXWUXE/NYd7OiiWZcgo3/7rq1ho= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BgFF979y; arc=none smtp.client-ip=209.85.216.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BgFF979y" Received: by mail-pj1-f42.google.com with SMTP id 98e67ed59e1d1-36bb43a58c7so236183a91.1 for ; Sat, 30 May 2026 07:35:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780151733; x=1780756533; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zDfvTLy1+sJMtcgOCTiZxQEYHCAfpO8m5RiCueB0hpU=; b=BgFF979yQqBJ2IfV0n0QAe7fhjE9Hrw5cv2O1+1m+WbH9dBl0iOPjfIX3bfb3EGtjI Jdmdl9txzNo+H+vDgIQW0RRgXX0rrCeTZ2IQ/7/EVyKnF6XT1rGxtfBBg4S89hfpcBq6 RLjH8oy/Lx7mciOvIzMYCpqUjb+T0lk4IAn8FJ1K+n+KOIJ6oOONbv/WdKCpAS78gL08 sIJPFA/gtjFL81ToJlGL6kXp1Hy7A5Qu6E8OSEuetgZaJynhU0YBaX+1Sg43u7spbdGF fR0l3FQQakdU1853IopmL2ErQ3g5UwPLyCAvRm53nftwZ1jkhCh1vIcopRS4G6UgvuP7 dq+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780151733; x=1780756533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zDfvTLy1+sJMtcgOCTiZxQEYHCAfpO8m5RiCueB0hpU=; b=mgOpEtHajSoFqWESv2ualIOaBU5C04NQYtEscud5JyWU9+6fTfnLp9x6OkqwE6s9vH JGetzP/gDFUHr92+CaDpSKHcWMbE9p6kH7w0Zci7T+3m279meoFYH2KnIiz9x6DRuF0L owvqEVZjqoBekEzQpH48zghWOLPFd7VR53iXUdJjvE9aRlKGDNQsJe5+FmhhRXGqoowD QccdNoZy89ncdDGvIt/glb0BRlqK0ZmckCvVnrXdxMNzuHFC8RxFz/inJJ7KDVemWxML AfanerTI9+9fCBy/87gKQ3wJ6Mt200IYyBWXYUM8a/QqPcpJXxqNyOgZPCghFbIDl4OF FFaw== X-Forwarded-Encrypted: i=1; AFNElJ/0wxAsESvLBol6W8DGa7lVpgtd9kRxEWAgaaopSJRS+M7jEbB7i61SzR7aiyrBsGrINJFOr+hzLHZ55jg=@vger.kernel.org X-Gm-Message-State: AOJu0YwddC9GYATfeoTiVx6JsRe3ArirCHVtgBdyzZwp8bsPxAUOM72q msPxZKOr/MXU9t6doyI/mHHCs+JpksrE+2xATcAOwaI8ThbGjoTCo8vX X-Gm-Gg: Acq92OGp7dlYiyLcYieR7X/Y4yqSh4jsazRX9QVMSSnlmwIum4ddeHowpo6AfWHo/mZ PLMHkhPrK+E/GmKKEDh1kp3TJq8ZLL7hWkclv06pCJhCUo/EwOeI53rPOF0OyiEHn8p8GJiaKgm jOkkEli34IQ57RSRvTPucHgIxIXmy2W11tELZFGq/NpeK98GogKGv17TEwBsoVzHy2JVDiLdbpz iBNrLIA4PQWwqF9AMzgoexCHM0at2GsB6Ydab1h9xN3KA93l1oOITB385jRKF+Mi1FJu6PPWT4W S1Lr3s7tRITntA2y2o8oRaCFUrXCQUAowL9Mj4vm7Lpi/IekEbHpHaXI8q3Sn2yp846M1kYiY0C 6AnyAcxipBbRt1oSOiTkYcqUuqS07d1NB6+NBBmvdo1e5pfGl/8oUd/aw5cV4NduaIWFAobJI7f l343PTkRZ+ZC/bdA6nFL6EsjCT950= X-Received: by 2002:a05:6a21:9189:b0:39f:a451:4a6a with SMTP id adf61e73a8af0-3b427e9c7c1mr2162463637.5.1780151732474; Sat, 30 May 2026 07:35:32 -0700 (PDT) Received: from ser8.. ([221.156.231.192]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84214b2acb7sm5832280b3a.13.2026.05.30.07.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2026 07:35:32 -0700 (PDT) From: DaeMyung Kang To: Namjae Jeon , Hyunchul Lee Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, DaeMyung Kang Subject: [PATCH v4 4/6] ntfs: validate resident volume name values on lookup Date: Sat, 30 May 2026 23:35:12 +0900 Message-ID: <20260530143514.3083601-5-charsyam@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260530143514.3083601-1-charsyam@gmail.com> References: <20260530143514.3083601-1-charsyam@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The shared lookup-time attribute validator now has a safe caller path for $VOLUME_NAME corruption: ntfs_write_volume_label() no longer treats lookup errors as an absent label, and the mount path reinitializes its search context before continuing to $VOLUME_INFORMATION. Add $VOLUME_NAME-specific resident value validation. A volume name is stored as a UTF-16LE string, so reject odd byte lengths, and reject values longer than the NTFS volume label limit. Empty labels remain valid. Also reject non-resident $VOLUME_NAME records. $VOLUME_NAME is required to be resident, like $FILE_NAME; a crafted non-resident record would otherwise pass lookup and ntfs_write_volume_label() would remove it as if it were a normal resident attribute. Signed-off-by: DaeMyung Kang --- fs/ntfs/attrib.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c index 98e0b8ea2edd..7e293b85ad19 100644 --- a/fs/ntfs/attrib.c +++ b/fs/ntfs/attrib.c @@ -607,6 +607,14 @@ static bool ntfs_file_name_attr_value_is_valid(const u8 *value, const u32 value_ value_length - offsetof(struct file_name_attr, file_name); } +static bool ntfs_volume_name_attr_value_is_valid(const u32 value_length) +{ + if (value_length & 1) + return false; + + return value_length <= NTFS_MAX_LABEL_LEN * sizeof(__le16); +} + struct ntfs_resident_attr_value { const u8 *data; u32 len; @@ -657,7 +665,7 @@ static bool ntfs_attr_value_is_valid(struct ntfs_volume *vol, u32 min_len; if (a->non_resident) { - if (a->type == AT_FILE_NAME) + if (a->type == AT_FILE_NAME || a->type == AT_VOLUME_NAME) goto corrupt; if (!ntfs_non_resident_attr_value_is_valid(a)) goto corrupt; @@ -676,6 +684,10 @@ static bool ntfs_attr_value_is_valid(struct ntfs_volume *vol, if (!ntfs_file_name_attr_value_is_valid(value.data, value.len)) goto corrupt; break; + case AT_VOLUME_NAME: + if (!ntfs_volume_name_attr_value_is_valid(value.len)) + goto corrupt; + break; } return true; -- 2.43.0