From nobody Sat May 30 12:37:17 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 EC85337C906 for ; Fri, 8 May 2026 07:29:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778225386; cv=none; b=GQaui9+NxqoAD7XmjC20UDKYhzey5hzBvs52fbMc/Q4EVPgTY0XGTldTIM6K0PgnxgkEpxePVsQ0mK0coxZNIYzZ2kP13CadY9N9flp205xZsk6iNaypjm2xGughCpAu3rf5pJ8iGqjFOBier/Tyv1B8A9XeiEuSi+yQb4Hmw4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778225386; c=relaxed/simple; bh=ZgrXGqpaDT/J0urZZBGJCBmmlHto5IvLWqZnYCnml38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r+d8/LYcnFeclhWOSvhHHSWBP/u8CdZEawFI5SBcOW5WspkhKdkeAQhDXEnYZXcWmizeXtgyVfbfhR8Bg0kfnO7P+VzFU0F/1BjVKMqCH/I9icFU4lD6lu5ySne89CqIznp8rWvtvjNgt0qc1CgJ536CdMYmVOwZuERFS3wRaRc= 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=KcVrs3p+; arc=none smtp.client-ip=209.85.214.172 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="KcVrs3p+" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2ba3e3c4f87so14952985ad.3 for ; Fri, 08 May 2026 00:29:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1778225381; x=1778830181; 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=1sGrET6MfLhRsKAL/g+VL/AvixebTV1us/He7UBP6No=; b=KcVrs3p+Jxbp5Gfp1WNs3/1mFstCczFytmXFszqw3B/++s45NBZ/j4whTSMArqzTTU GqEAqJEf6XCpOqxgbuObKzK+Dssz095nqvU94RzleSK2QAwuZQtCyzl7hzHJ13Uz3XPZ Cfv1dN5Ko0+BQfzl6Mw3kulWLDk46KQAbivVCc5rH28AxZ9umQJRPpDAxtmzA5vsEWNm fU+i2MesHmBnMIYyNAMBPXnmSPDW7iw9I5tnTMuu/eCmsx1EYm1y8Yo+mfg3fzOi7+bE n78iEl+lOliZSp9VLr4SCjeIOmy6xFpnWytsv8HV1E2TT4r7MQF8vyGpkePhyNubxxg/ JXAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778225381; x=1778830181; 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=1sGrET6MfLhRsKAL/g+VL/AvixebTV1us/He7UBP6No=; b=P0G+ZDvbZVYwnIpCcAygGFnyLwT7b0lQVV4raJr1hvUHPpqiVqjFLQTfHhWp1mfpFd TMBwwaGg3lf4odK/pkfzro93JDfZe3Il8FzthhNp31b5mMTQAJxAqY88CJMSvGdSLNL4 Xt6hrXwuAnxPMHnrC7sqwmZbtGUG9wnRN6bN0RBC87H+nfi4KZVNnGUUtC9Jf4QP67LA iNxZ952oqglkhotR7AdLjXXvYmYdlac0HkCTI4Pyd604JZN2ZJQ9wNwa8g8H2aXyZCQg LyDZDfcHxqbvTLjPUOT1wii+xcWZ8Vp6dqB5O6lHxpdrg6oCPzquYkK/6lqPjQ0URJKn S2yg== X-Forwarded-Encrypted: i=1; AFNElJ/pSVRGqirAdR6gi0p7ZdVLeKHn7al64zEbMoodPmUPwHdfTDg+4MemKqDJA9Vgg0pu5N2zVFbzFAgCLw8=@vger.kernel.org X-Gm-Message-State: AOJu0YyAKkI/zT9641X7edajHetfqyLro+Gcf5Bhw6n1TgKG+ervrTqY ui9omnTBdPLFPxerL/Sr7A+XYN3uWXYuFGHSeUm9TPJRJjJYhNGhUW2zm5UmqZc2 X-Gm-Gg: Acq92OFnJOfBIMCSOn4ZzCLifpvRtzj5b6ny7dcWMFrWi7ytf79YehFC+ODn+CIcY+R 7JW9imLXb9RtEc7Hk5oeSlym5V58kpWCwqa+BVPitO9gbmzsLQk5LXJE9sZ1s7LdfoC98YgrZrQ vfQgGnLP6AVrgPWeJLXwdKc7jDBcQHotPmC079MsobqH8YLB1mvTDelbSgBGINawx5q++F5j1zM El4TyPoWlf2Xwv5UVzJ9AfXd8yxrt0nXoSCTeOJ9KvQlVCLrwqpL9qJD5RdRWqv4drmrQS5175x DPaSFD+g/OTi2us+FR2mPX0JpQAIFbB15AGRlC+Xp0499NP5/wrB1IXoqc1YBf4dNSbttbLpfvh v6kxOFN2m9zHEza2QZFWeShKJ6FoyR0smEHFerbdNessBrbP5703ak5NhjeEMlbbx0sn12plDx8 eeqZPdPzbT29pHOo9P+Pz5jfCCD2vZnCpBWaSrwgStY477MhZSPE8153Vb/A== X-Received: by 2002:a17:903:2f07:b0:2b2:4fcc:2687 with SMTP id d9443c01a7336-2ba79bf5da9mr125351735ad.31.1778225380496; Fri, 08 May 2026 00:29:40 -0700 (PDT) Received: from DESKTOP-MOQC9AF.mioffice.cn ([43.224.245.246]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e35632sm12053365ad.53.2026.05.08.00.29.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 May 2026 00:29:40 -0700 (PDT) From: Zhan Xusheng X-Google-Original-From: Zhan Xusheng To: Namjae Jeon , Hyunchul Lee Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Zhan Xusheng Subject: [PATCH v2] ntfs: fix missing kstrdup() error check in ntfs_write_volume_label() Date: Fri, 8 May 2026 15:29:34 +0800 Message-ID: <20260508072934.75939-1-zhanxusheng@xiaomi.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ntfs_write_volume_label() does not check the return value of kstrdup(). If the allocation fails, vol->volume_label is set to NULL while the function returns success. A subsequent FS_IOC_GETFSLABEL then returns an empty string even though the on-disk label was updated correctly. Fix by allocating the new label before taking vol_ni->mrec_lock and updating any on-disk metadata, so an -ENOMEM from kstrdup() leaves both the in-memory and on-disk labels untouched and consistent. On success the preallocated copy replaces the old vol->volume_label. Also move mark_inode_dirty_sync() into the success path so that it is not called when no metadata was actually modified. Fixes: 6251f0b0de7d ("ntfs: update super block operations") Suggested-by: Hyunchul Lee Signed-off-by: Zhan Xusheng Reviewed-by: Hyunchul Lee --- fs/ntfs/super.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 22dc7865eca7..ba99c497ee38 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c @@ -413,6 +413,7 @@ int ntfs_write_volume_label(struct ntfs_volume *vol, ch= ar *label) { struct ntfs_inode *vol_ni =3D NTFS_I(vol->vol_ino); struct ntfs_attr_search_ctx *ctx; + char *new_label; __le16 *uname; int uname_len, ret; =20 @@ -425,7 +426,7 @@ int ntfs_write_volume_label(struct ntfs_volume *vol, ch= ar *label) return uname_len; } =20 - if (uname_len > NTFS_MAX_LABEL_LEN) { + if (uname_len > NTFS_MAX_LABEL_LEN) { ntfs_error(vol->sb, "Volume label is too long (max %d characters).", NTFS_MAX_LABEL_LEN); @@ -433,11 +434,22 @@ int ntfs_write_volume_label(struct ntfs_volume *vol, = char *label) return -EINVAL; } =20 + /* + * Allocate the in-memory label copy up front. If kstrdup() fails we + * bail out before touching on-disk metadata, so the in-memory label + * and the on-disk label stay in sync. + */ + new_label =3D kstrdup(label, GFP_KERNEL); + if (!new_label) { + kvfree(uname); + return -ENOMEM; + } + mutex_lock(&vol_ni->mrec_lock); ctx =3D ntfs_attr_get_search_ctx(vol_ni, NULL); if (!ctx) { ret =3D -ENOMEM; - goto out; + goto out; } =20 if (!ntfs_attr_lookup(AT_VOLUME_NAME, NULL, 0, 0, 0, NULL, 0, @@ -450,12 +462,14 @@ int ntfs_write_volume_label(struct ntfs_volume *vol, = char *label) out: mutex_unlock(&vol_ni->mrec_lock); kvfree(uname); - mark_inode_dirty_sync(vol->vol_ino); =20 if (ret >=3D 0) { kfree(vol->volume_label); - vol->volume_label =3D kstrdup(label, GFP_KERNEL); + vol->volume_label =3D new_label; + mark_inode_dirty_sync(vol->vol_ino); ret =3D 0; + } else { + kfree(new_label); } return ret; } --=20 2.43.0