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 3B3A619FA91; Tue, 30 Jul 2024 12:46:08 +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=1722343569; cv=none; b=lZ9YQN2sqepFTntbcwFbE64eftFLsyoU2safCxVrkIJ7oaXXYIn06h4QdA/GoGp8WnKrDpPKzFd1aLlxQDwI4hnrhM5qruF6379aA05Nam+ah77DxXCxEdnzQxMwfobVIfRwSvvydsicwSXmmVXhDGPcp8TR/+BXoE9yhiaQXks= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722343569; c=relaxed/simple; bh=MVz/znc9I233RgIM9zDHWcICToeODo3lTIKp9s5T8N4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DvpBmhQ6O5CUDOLdvcRVHVoRD7kv+9ceCwSCeXYMHaac9mXrhy00RimTTKIS9s/XlJhqd5wREtcX1UoBtB7VFhuTQZY0ClLkyNKJs3gmyvVAQLdGfHJ6h96yY4oyXgyX5AVIZ0QTcNN5cNDOqDNpr72QzhF8TJCqYvc6VROoOQM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Xp0ee1VJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Xp0ee1VJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E65AC32782; Tue, 30 Jul 2024 12:46:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722343568; bh=MVz/znc9I233RgIM9zDHWcICToeODo3lTIKp9s5T8N4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xp0ee1VJmq6ZhWgM6Wrk4y9aDyJ882nXmDGUzzzDx89DddDh0paEdLY84nFcYDyRZ F57x7oPaq54OijOYiw+2DMpwJJMGkmZJTqbzxpohFhmO0Qiut9Qt6uIe2858lL+lXq OXA7bqNkIaiyuJu3xLdVpMdKo4bA/8CX1YPhot2e7bTnlJiZ8KRlGNuDCct9Yskf4X hq4qvxtAJMifRDSn7W6tT2SmvUiyhaFjRew/4AbDEMFDLo2l3XO36ZG9+5WTRxVCMo cUUMhiie0VbM0RI93I9O4eCjlsQzjXeWDXnlRo/0vWCUhpCvAxJsW/8nONin/CcKBM 6Sr5fYuZQuT7Q== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Edward Adam Davis , syzbot+bba84aef3a26fb93deb9@syzkaller.appspotmail.com, Dave Kleikamp , Sasha Levin , shaggy@kernel.org, osmtendev@gmail.com, ghandatmanas@gmail.com, jfs-discussion@lists.sourceforge.net Subject: [PATCH AUTOSEL 6.1 2/3] jfs: fix null ptr deref in dtInsertEntry Date: Tue, 30 Jul 2024 08:45:58 -0400 Message-ID: <20240730124603.3096510-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240730124603.3096510-1-sashal@kernel.org> References: <20240730124603.3096510-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.102 Content-Transfer-Encoding: 8bit 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