From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 995E92D94A2 for ; Tue, 4 Nov 2025 12:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762260670; cv=none; b=cFbUqgUeQx58rFd2h9Mbxnp0qVpQIxIUKdnnn6SWOCcZ87Z/0Y/Igpv+wKFydtdOoPwuREtjldJRqkwMwa2zLrySYzssueFYt0xCZcyyEE34qHrGU5Ag4zX5g4x3ccayBWsOQ2QyPs/gBTetfUDyLZZkZ8efg90tSrWKptl1KY4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762260670; c=relaxed/simple; bh=S3L8yWcPf7Uvvhuw8kb5mV50ABXqzeKjCs/M0blRocI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s2AqEXXXoxrNSVSG3BA8VGovuj1Yxs5nTMSzr/er1jkZP05Vclp64iFA/QgYOupY6aG91QrvB8A0Wfur5xRXnSo7UeYlZwSmoecXt0rlAczR4a1/KttyvBnEHcqVQzGf0C2fOt2gBOzWV6oC2muqZReoumJjBMj7IpoMz0oGZLg= 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=a1g5b/AV; arc=none smtp.client-ip=209.85.216.51 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="a1g5b/AV" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-34088fbd65aso4596537a91.0 for ; Tue, 04 Nov 2025 04:51:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762260668; x=1762865468; 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=AM4LaUJGUQ26yP1YfE9/TUkYoY6eJkQufUALxNmpnUs=; b=a1g5b/AVw083mhh/EpgN81CSzncrNP02f45pvke2+H2d1K+ePlVS7/AdsD//K9Xnmm qLQtCsFfGFCsnt2Y/LqodDoEmtnTjbsPVRijPGMOzjp0GrT6jJL8sdP48Eoy9tWypLhk 1YEXzboA7S8rYv5hW9Nmuvn7MaNVAdbpT8fGWCOGm1ABaIlRHVIxd8itcTcCtSMsoJRo O++Q3h3FigWAIxt9iAnB5dc4USxmpEj8iMHUnvo9xgf9XB0zI+CrA3rKO0RlNI7DVTi+ zzTaTGet8CBRG/cJ655hUKqPe3QlZrOvO1Mi2xNKjwg7K97c9O/ir94bdqljjK0esjBv wxyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762260668; x=1762865468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AM4LaUJGUQ26yP1YfE9/TUkYoY6eJkQufUALxNmpnUs=; b=D0nKJeibghar2QYRnY/5baia4AC98CCak/Gxgcm1aX8jlcKhYw27eOR3iwY9F48Woe JJetsfKRUTpPZbBVExZZ4DkwWDxEKjQXhssQdIvYIu9kdejFC7nnGmVtfbyUM7YEPzAv PEFw2Fw5Sz4EuKwGQLVUzL7U2hdlbk+2MnKAF3Fy+A30yiqTsjXeYwNkyiByb57l53kE 4S77jtK3N7VMRo7mrzZshLgNyWzPodk5kvndO/ADQzXc1Q7X3FGcVJyG73fqSSYgW+P4 3tcuo/fHnbWbKosw/vOBvt331ISu9Nkcw5gG4rAPnpCNdeJqJD+IY4Bk7UV3rLdYPNTT qy2Q== X-Forwarded-Encrypted: i=1; AJvYcCV0kvwcnJkKhrFYrJhPyicpWpmgNZdcPf88BT4frNIdXKUAGVqHjiNlgZuFFC6XLdOLA8rcymt3aJFbdw==@vger.kernel.org X-Gm-Message-State: AOJu0Yyo5ejb04JJlhZ1DHQHdN8308SpKg4n9PqqL9PZ+wIe/xHoWYK0 Nk6cHkEUd8qJh9BzNYacuK84Qxeezgz1HX/YLQqDIuG2Q/5Ug8JbUcIS X-Gm-Gg: ASbGnctznf0LaT78Fkyyjn43EonLh1N4WKYfUYB/c3ZJ1wRxkmwzSWEvr0L3cvzmyog xCiGx0jTrJIHyHMoHxMdU3vjUBaG7LMFeNLYLPIzeH0f1ocK3x4FCbu+QjfZJOYkaJfOx+bYMRT dT2MGZakghcrqzuFBnH8dBK2fCgmCHvHXrQJYonEQjaBwkQsNECLGI2ZL5fd1Vgjofx71OMP4Zw eTLlhEvCmaIHmu1paVuKmu2Y6OakRKYfQcI1A+CiI1SPVlA0pJfhMMA5c8pIe4OdwbDcYKq4BMY 1eH8Tv3wocb2cGkwgNDIpuqzUhI/su+aEB33oLz1mY3PSBQFzkpJ4Slf1J8B2LCI2oR2Zg2mov0 2epI+jlR3UGOGiq74h32IL1dVFq3U2odJXJwL2pCSxipCbjJ6g8UIkKQn/gDVsz0Q5JJa+2BY0+ LiGNzi3tzu2H1hor/Sr5MaafBsLmvQfhSzFu9F1IQrcqEC0zo= X-Google-Smtp-Source: AGHT+IH3JuuEMoP9YT3zyIl/+HUSXK+p3FIZ5E5NT2awhGYYunlZYurin74ce3hTLqp46OSwVZT1sA== X-Received: by 2002:a17:90b:3946:b0:33b:c9b6:1cd with SMTP id 98e67ed59e1d1-34083074e9bmr20646792a91.19.1762260667843; Tue, 04 Nov 2025 04:51:07 -0800 (PST) Received: from xiaomi-ThinkCentre-M760t.mioffice.cn ([43.224.245.241]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7acd6d026dcsm2860710b3a.70.2025.11.04.04.51.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Nov 2025 04:51:07 -0800 (PST) From: Yongpeng Yang To: Namjae Jeon , Sungjong Seo , OGAWA Hirofumi , Jan Kara , Carlos Maiolino , Jens Axboe , Greg Kroah-Hartman , Sasha Levin , Alexander Viro , Christian Brauner , Christoph Hellwig Cc: linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, stable@vger.kernel.org, Matthew Wilcox , "Darrick J . Wong" , Yongpeng Yang , Christoph Hellwig Subject: [PATCH v6 4/5] xfs: check the return value of sb_min_blocksize() in xfs_fs_fill_super Date: Tue, 4 Nov 2025 20:50:09 +0800 Message-ID: <20251104125009.2111925-5-yangyongpeng.storage@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251104125009.2111925-2-yangyongpeng.storage@gmail.com> References: <20251104125009.2111925-2-yangyongpeng.storage@gmail.com> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yongpeng Yang sb_min_blocksize() may return 0. Check its return value to avoid the filesystem super block when sb->s_blocksize is 0. Cc: # v6.15 Fixes: a64e5a596067bd ("bdev: add back PAGE_SIZE block size validation for sb_set_blocksize()") Reviewed-by: Christoph Hellwig Signed-off-by: Yongpeng Yang --- fs/xfs/xfs_super.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e85a156dc17d..fbb8009f1c0f 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1662,7 +1662,10 @@ xfs_fs_fill_super( if (error) return error; - sb_min_blocksize(sb, BBSIZE); + if (!sb_min_blocksize(sb, BBSIZE)) { + xfs_err(mp, "unable to set blocksize"); + return -EINVAL; + } sb->s_xattr = xfs_xattr_handlers; sb->s_export_op = &xfs_export_operations; #ifdef CONFIG_XFS_QUOTA -- 2.43.0