From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E2CAF145330; Tue, 23 Apr 2024 21:44:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908658; cv=none; b=Y4doooLG2ngC+UEHZR37OCDB8bOCVn6Aez9EUDXlP3Awrpn9hSrVNWopCJxGMwn2jtuTyuaFeuTgKSQpww9JtUwTOf7pVblFeHUsca3ChnLyPXjl2Ee1J4gkZcQMQH8SxUedW/T49XLmIKR+OJucqUQOeHN/HgALvSOCQ3MUnCc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713908658; c=relaxed/simple; bh=kAfp8+2TJw0y1R2OqBt0mWqYzn7rW7Ny6/nXGBLnAYU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XpRUu7TzknCSsLYxZwgGgMMeVN9+qAwU6xMjncxfhDL0kypjvUDxuGiLKcoQWDMFj4+JmzGQhHwelPlN+RQ8DcfrISkSW6WEXqM8YRPTzx5uZcKBaX0TurJWgOGY2vDb6QuDr++FAxn04XwPEiVic3lVGAAdF+5C85EYQtHyvqo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p71IBHMA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p71IBHMA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0A1EC116B1; Tue, 23 Apr 2024 21:44:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1713908657; bh=kAfp8+2TJw0y1R2OqBt0mWqYzn7rW7Ny6/nXGBLnAYU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p71IBHMAa0Xs9l/gOVmPOJr+8gLWUhI1rcFVst55ks8OvAxXFtVBiAPz1kS+p2l9+ v/dtaHTsS/DSwCO//kV0zVyhitgRhnXFJOR7L3d2ZJ9FFEp82yOkIRCHI9stWv/HEZ AvMoji0+GZROgXOuSsU2on3NCa8q/mSAIGHZFKWc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+2e22057de05b9f3b30d8@syzkaller.appspotmail.com, Jeongjun Park , Ryusuke Konishi , Andrew Morton Subject: [PATCH 6.6 149/158] nilfs2: fix OOB in nilfs_set_de_type Date: Tue, 23 Apr 2024 14:39:46 -0700 Message-ID: <20240423213900.512192438@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240423213855.696477232@linuxfoundation.org> References: <20240423213855.696477232@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeongjun Park commit c4a7dc9523b59b3e73fd522c73e95e072f876b16 upstream. The size of the nilfs_type_by_mode array in the fs/nilfs2/dir.c file is defined as "S_IFMT >> S_SHIFT", but the nilfs_set_de_type() function, which uses this array, specifies the index to read from the array in the same way as "(mode & S_IFMT) >> S_SHIFT". static void nilfs_set_de_type(struct nilfs_dir_entry *de, struct inode *inode) { umode_t mode = inode->i_mode; de->file_type = nilfs_type_by_mode[(mode & S_IFMT)>>S_SHIFT]; // oob } However, when the index is determined this way, an out-of-bounds (OOB) error occurs by referring to an index that is 1 larger than the array size when the condition "mode & S_IFMT == S_IFMT" is satisfied. Therefore, a patch to resize the nilfs_type_by_mode array should be applied to prevent OOB errors. Link: https://lkml.kernel.org/r/20240415182048.7144-1-konishi.ryusuke@gmail.com Reported-by: syzbot+2e22057de05b9f3b30d8@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=2e22057de05b9f3b30d8 Fixes: 2ba466d74ed7 ("nilfs2: directory entry operations") Signed-off-by: Jeongjun Park Signed-off-by: Ryusuke Konishi Tested-by: Ryusuke Konishi Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- fs/nilfs2/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -243,7 +243,7 @@ nilfs_filetype_table[NILFS_FT_MAX] = { #define S_SHIFT 12 static unsigned char -nilfs_type_by_mode[S_IFMT >> S_SHIFT] = { +nilfs_type_by_mode[(S_IFMT >> S_SHIFT) + 1] = { [S_IFREG >> S_SHIFT] = NILFS_FT_REG_FILE, [S_IFDIR >> S_SHIFT] = NILFS_FT_DIR, [S_IFCHR >> S_SHIFT] = NILFS_FT_CHRDEV,