From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ACE9340926D; Tue, 21 Jul 2026 22:59:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674752; cv=none; b=V1OSarZkTF20MnfRkYTy0TgX6+qGpqBluoP6PvL7MoDKnzquAkJk5j9uUNpF5AAeuoD67LZO7fYme9QyqgMKhN3E+F4VcbLXVOYiUY+ikd3haTERMv43Q/7m/AQNvCqBopVIhyinzkEZigYPEhgnkLhCiSZ2zYVd/RUSTml1Gn4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784674752; c=relaxed/simple; bh=44kVd84gUs4jYlltzdcJs03uDChy49K4/DGeO9ZOZjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dtYibMRZ9yEvAWgH0pJACvWJ6fHR1CjVgxjBTgQk6jZh/Qa0ps/gri0GyheG7MRTiC+h3qWXplevPSuYfbTkR0/5IhwP9fL/yryR+gXvXDp20S0Jk9/fj+kqXV5gn2frG0EBV2LZxQ4fWdAojAOAVNl7NVVDkIUH/i+4QD5AMk0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GqkBEmF7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GqkBEmF7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DBD71F000E9; Tue, 21 Jul 2026 22:59:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784674750; bh=2l8pnEI0guvn4l6gUMlZ1SmaXUHfj+IkwPywcItkK/E=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GqkBEmF7yEVp6ssHNZjR8kCbF+jr7+GXqbFp2YPxkAifun59g3IXbt8gVYVxFHXUj xOk74dKn9+t9LaahKSBBoBNt1fkQyROx73/mgJsrSsoHKCaHIUpwGopo0OXhX99v2T kXwJ++TvaUWoC8hJHkFgRGFIBoI914wTE0BFSBgQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexey Nepomnyashih , "Darrick J. Wong" , Allison Henderson , Carlos Maiolino , Sasha Levin Subject: [PATCH 5.10 659/699] xfs: fix unreachable BIGTIME check in dquot flush validation Date: Tue, 21 Jul 2026 17:26:58 +0200 Message-ID: <20260721152410.629935733@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152355.667394603@linuxfoundation.org> References: <20260721152355.667394603@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Nepomnyashih [ Upstream commit 03866d130ed33ab68cc7faaf4bf2c4abef96d42e ] The dqp->q_id == 0 check inside the XFS_DQTYPE_BIGTIME block is unreachable because root dquots return successfully earlier. Reject root dquots with XFS_DQTYPE_BIGTIME before that early return, preserving the intended validation and removing the unreachable condition. Found by Linux Verification Center (linuxtesting.org) with SVACE. Fixes: 4ea1ff3b4968 ("xfs: widen ondisk quota expiration timestamps to handle y2038+") Cc: stable@vger.kernel.org # v5.10+ Signed-off-by: Alexey Nepomnyashih Reviewed-by: "Darrick J. Wong" Reviewed-by: Allison Henderson Signed-off-by: Carlos Maiolino Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/xfs/xfs_dquot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c @@ -1201,6 +1201,14 @@ xfs_qm_dqflush_check( type != XFS_DQTYPE_PROJ) return __this_address; + /* bigtime flag should never be set on root dquots */ + if (dqp->q_type & XFS_DQTYPE_BIGTIME) { + if (!xfs_has_bigtime(dqp->q_mount)) + return __this_address; + if (dqp->q_id == 0) + return __this_address; + } + if (dqp->q_id == 0) return NULL; @@ -1216,14 +1224,6 @@ xfs_qm_dqflush_check( !dqp->q_rtb.timer) return __this_address; - /* bigtime flag should never be set on root dquots */ - if (dqp->q_type & XFS_DQTYPE_BIGTIME) { - if (!xfs_has_bigtime(dqp->q_mount)) - return __this_address; - if (dqp->q_id == 0) - return __this_address; - } - return NULL; }