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 904DC481DD; Sat, 30 May 2026 17:06:54 +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=1780160815; cv=none; b=qTd790prVFC4VhloA4Ebj+fgPnlWcoBul7UDJ2zCkBHIFDvNBgcyMg3WRFojRrNB9P/JstBZcIoW3daTAJ9xlxhXJn9e8vdt0yZkTCNxZqtDwggGQi0F2x10IO1yyYzKx83ls8DuvG5yE/E3NFNhzGJeBOe59Rt6FclBlkUU/DM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780160815; c=relaxed/simple; bh=NcHyyEqRhCpjdC5SbRkdDSm5UzdnZC8cZMJJBkfv3k8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J5IjC+Us84Bn3jp61S7Jnk7zcSFYnQevkpfDkIjGttzWkA2s/Wmw9ZCf+q1Zl4o2WvWRfrU9MzDyoniJthIEjmRs9sHCVo98ZjLPIoB5rZyNLJCjjWwH42g0elPgrertP30m/I2vLQ7bfwi71/bPW5klstTNHr/aFGk/IT1aCw8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lJAQFOe/; 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="lJAQFOe/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C4D41F00893; Sat, 30 May 2026 17:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780160814; bh=TLe6f/d/pDpOMMYtvgVyFGCt2aVLigRvq/X3MA2f4UI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lJAQFOe/jW4xp9M8nIiFEsJRgSfo6vaKB3fatWyDNz3fcf73mJgPsSlGVzSbt7BLx HfIH1GKpxTic1cCsHE1IPM3LsrG6EKJ4/nuhoLzbmnyojhcR4f/6nMJklrVlEKkkoS PLK6oqcTuFu/HggEvAkmoIVQqIpiZ8neIi+A8q2A= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+98a040252119df0506f8@syzkaller.appspotmail.com, Ryusuke Konishi , Deepanshu Kartikey , syzbot+466a45fcfb0562f5b9a0@syzkaller.appspotmail.com, Junjie Cao , Viacheslav Dubeyko , Sasha Levin Subject: [PATCH 6.1 435/969] nilfs2: reject zero bd_oblocknr in nilfs_ioctl_mark_blocks_dirty() Date: Sat, 30 May 2026 17:59:19 +0200 Message-ID: <20260530160312.277380186@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Deepanshu Kartikey [ Upstream commit be3e5d10643d3be1cbac9d9939f220a99253f980 ] nilfs_ioctl_mark_blocks_dirty() uses bd_oblocknr to detect dead blocks by comparing it with the current block number bd_blocknr. If they differ, the block is considered dead and skipped. However, bd_oblocknr should never be 0 since block 0 typically stores the primary superblock and is never a valid GC target block. A corrupted ioctl request with bd_oblocknr set to 0 causes the comparison to incorrectly match when the lookup returns -ENOENT and sets bd_blocknr to 0, bypassing the dead block check and calling nilfs_bmap_mark() on a non-existent block. This causes nilfs_btree_do_lookup() to return -ENOENT, triggering the WARN_ON(ret == -ENOENT). Fix this by rejecting ioctl requests with bd_oblocknr set to 0 at the beginning of each iteration. [ryusuke: slightly modified the commit message and comments for accuracy] Fixes: 7942b919f732 ("nilfs2: ioctl operations") Reported-by: syzbot+98a040252119df0506f8@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=98a040252119df0506f8 Suggested-by: Ryusuke Konishi Signed-off-by: Deepanshu Kartikey Reported-by: syzbot+466a45fcfb0562f5b9a0@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=466a45fcfb0562f5b9a0 Cc: Junjie Cao Signed-off-by: Ryusuke Konishi Signed-off-by: Viacheslav Dubeyko Signed-off-by: Sasha Levin --- fs/nilfs2/ioctl.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 1d4d610bd82b5..7f972f0b1a885 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c @@ -751,6 +751,12 @@ static int nilfs_ioctl_mark_blocks_dirty(struct the_nilfs *nilfs, int ret, i; for (i = 0; i < nmembs; i++) { + /* + * bd_oblocknr must never be 0 as block 0 + * is never a valid GC target block + */ + if (unlikely(!bdescs[i].bd_oblocknr)) + return -EINVAL; /* XXX: use macro or inline func to check liveness */ ret = nilfs_bmap_lookup_at_level(bmap, bdescs[i].bd_offset, -- 2.53.0