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 BE3C01C2317; Tue, 27 Aug 2024 15:19:42 +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=1724771982; cv=none; b=tQXVdGHDMjInJM9qXhA6/Zpim9hJYW2psqxpgXc4zYTtDXO1Bfufou0rOkTtegXWc5Oe2VK5pcPglDsdq9DmDntK+nZ/+IA7898BA8maQOa6mzm0kQxJViRhkE+pHpJpVcwrRQIq7P9FsZTwMGLbr0UmIxu+2tvkfYW3j9zncxY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724771982; c=relaxed/simple; bh=jZbOK013AdLWKg2YTzqbMm9nUgWVcJkwAFT7cywTogQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WZCX9dO+c0H7kF8a3qCLyKLN1ATtcoBY/+SN4jAojQ5QcDnsT/QUFnrmu0BFdWKeFRS2XGA8qSK32rCh2muJiUptSCelkiuiPySPocA9znX9nRz19xl/50tLHwQEp74zY0oG0ZUrc9rEHvQzwRq9N+c+8Rhu7ZF9ZvCuf2XCYvo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=a8kdHxx3; 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="a8kdHxx3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2CD4AC61067; Tue, 27 Aug 2024 15:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1724771982; bh=jZbOK013AdLWKg2YTzqbMm9nUgWVcJkwAFT7cywTogQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a8kdHxx3vS9gUUmNQqBaz0WYhX632SFNAtn7GMv1owlgyunAWMT8QQ8qBZ4e+BjGb /I4cfHp5Lakr5NER3evPfjeUpf9Do4o/M73PvPuI3lOQOemiecqtDPVh58cjSdp2Gh IwAeIQXv7le/mxgZuWWN3eouB8asujsYYxYcaeLQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+bba84aef3a26fb93deb9@syzkaller.appspotmail.com, Edward Adam Davis , Dave Kleikamp , Sasha Levin Subject: [PATCH 6.1 079/321] jfs: fix null ptr deref in dtInsertEntry Date: Tue, 27 Aug 2024 16:36:27 +0200 Message-ID: <20240827143841.248954329@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240827143838.192435816@linuxfoundation.org> References: <20240827143838.192435816@linuxfoundation.org> User-Agent: quilt/0.67 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: Edward Adam Davis [ Upstream commit ce6dede912f064a855acf6f04a04cbb2c25b8c8c ] [syzbot reported] general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] PREEMPT SMP KASAN PTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 0 PID: 5061 Comm: syz-executor404 Not tainted 6.8.0-syzkaller-08951-gfe46a7dd189e #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 03/27/2024 RIP: 0010:dtInsertEntry+0xd0c/0x1780 fs/jfs/jfs_dtree.c:3713 ... [Analyze] In dtInsertEntry(), when the pointer h has the same value as p, after writing name in UniStrncpy_to_le(), p->header.flag will be cleared. This will cause the previously true judgment "p->header.flag & BT-LEAF" to change to no after writing the name operation, this leads to entering an incorrect branch and accessing the uninitialized object ih when judging this condition for the second time. [Fix] After got the page, check freelist first, if freelist == 0 then exit dtInsert() and return -EINVAL. Reported-by: syzbot+bba84aef3a26fb93deb9@syzkaller.appspotmail.com Signed-off-by: Edward Adam Davis Signed-off-by: Dave Kleikamp Signed-off-by: Sasha Levin --- fs/jfs/jfs_dtree.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/jfs/jfs_dtree.c b/fs/jfs/jfs_dtree.c index 031d8f570f581..5d3127ca68a42 100644 --- a/fs/jfs/jfs_dtree.c +++ b/fs/jfs/jfs_dtree.c @@ -834,6 +834,8 @@ int dtInsert(tid_t tid, struct inode *ip, * the full page. */ DT_GETSEARCH(ip, btstack->top, bn, mp, p, index); + if (p->header.freelist == 0) + return -EINVAL; /* * insert entry for new key -- 2.43.0