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 8726812A16B; Tue, 23 Jan 2024 00:50:31 +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=1705971031; cv=none; b=VqUWKJvFaeGG/R6xvD63Cc0De/1MDvilOyGNKGanUieXy6NaDYS+z0WGSKoxp+2vX40eNBhSDv9hZ28dLjmbvx1B51mCJeaXtJlfefw9PnfLmyopTVDpCIoGu8lPNZLl4gnzXwsjLGaAHjFbuCYT2mQPSfogUjRFkRob43MVAxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971031; c=relaxed/simple; bh=ei0hcGbZ/gZ9bww2Jndg/TR9VjiOOnAInqJRBu02md4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FE5p78/JhnyKRfB0vt4LDefqYOzeRwRABRN1d3qyFVfeQSpYcAhh9jqOuCxsD1cRnv2Mhl+ka0nwswQk26ed4OS2ODSgRdSBQfV0g9jyeVdrA5W3tMZOy15XmQa1q3prhxWIXgN99m0YYDeaNaAdSOLCgtXxUuB3naeSHwfOUBU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=AHWh9xl9; 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="AHWh9xl9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9C29EC43394; Tue, 23 Jan 2024 00:50:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971031; bh=ei0hcGbZ/gZ9bww2Jndg/TR9VjiOOnAInqJRBu02md4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AHWh9xl9V5CiZQrf52Hq4KfqM9T65qmyuvPKi3IctuToiqrUSZSHHH/Ji/4T6NgXt FtQjws0tt0a9BDZHIZ7babLJ2YYsbRnK8MkyDDI8jj9grCGCjHrx54Kw5AMdEsMUoP VU+5j9lbqggG1c2le6mkfsXkZiJlGCU78BG18yc0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Ricardo B. Marliere" , Mike Isely , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , syzbot+621409285c4156a009b3@syzkaller.appspotmail.com Subject: [PATCH 6.1 165/417] media: pvrusb2: fix use after free on context disconnection Date: Mon, 22 Jan 2024 15:55:33 -0800 Message-ID: <20240122235757.559348158@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ricardo B. Marliere [ Upstream commit ded85b0c0edd8f45fec88783d7555a5b982449c1 ] Upon module load, a kthread is created targeting the pvr2_context_thread_func function, which may call pvr2_context_destroy and thus call kfree() on the context object. However, that might happen before the usb hub_event handler is able to notify the driver. This patch adds a sanity check before the invalid read reported by syzbot, within the context disconnection call stack. Reported-and-tested-by: syzbot+621409285c4156a009b3@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/000000000000a02a4205fff8eb92@google.com/ Fixes: e5be15c63804 ("V4L/DVB (7711): pvrusb2: Fix race on module unload") Signed-off-by: Ricardo B. Marliere Acked-by: Mike Isely Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c index 14170a5d72b3..1764674de98b 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-context.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c @@ -268,7 +268,8 @@ void pvr2_context_disconnect(struct pvr2_context *mp) { pvr2_hdw_disconnect(mp->hdw); mp->disconnect_flag = !0; - pvr2_context_notify(mp); + if (!pvr2_context_shutok()) + pvr2_context_notify(mp); } -- 2.43.0