Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3092408ybj; Mon, 23 Sep 2019 14:42:48 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfR+zcZEKqtex4FbrZBClNtK8wYTA0hTDAhVFlG3q3qbnoLfP7ibXCoPcjCcwgSOo8EJ16 X-Received: by 2002:a50:a5f8:: with SMTP id b53mr2335049edc.39.1569274968242; Mon, 23 Sep 2019 14:42:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569274968; cv=none; d=google.com; s=arc-20160816; b=evtP0CY0DW3tATk5mxY73TzmV8fxmgULT1CTcf3zH8YNJnOv29VMmFx2ase/lOUVs3 Jqh70xxS+4FSIzQUcBrAMWMds0/HUHgTeDupSP9BwevyG0A5+ezWH2TKngNKiuyqa9r0 e5Vq1zhstZHvXDzpOX35OUK7cYlkx2a6sdNv/fYKgYz2Ao3JoTUM3++41RAH31GAAq/n i47DA2AEL6HR2pR7qy17usr52t2wc0rfgNx3rTS8oQ2HNo6xFBHM0nFUYcP2rg6eW7/j GxekUlfLwWtEnlVa1Y/0+kDLHprkaubUFWreSafeOTWLuc0q2i3S2J7N0HNu5OzbQ4uR n40w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uTfGobp4J+FMEYIB0Eu7aUNWtM/qx/7isX7yKCyh/IQ=; b=V6LrE22F89hMV8ufbOAAKd31hBi5GswD8TsJbTDSSqAbnXqjJPs7dX0QaWe2oCxdfH jJPJilhxznJr3k5vFpK4OTWB7poGKP5a18I6U/6wcgr72CqB6Z0LiHc/yyeWNWdGa0G3 MkV9MAhrpC7J0dZ0a+u3aV64gDMm3py+ZtriffXvw+OtS5QUDzBCK7jWkn6HNMbsLRRr k41UK/zhonBjtGYIl/KndwTeUAzL/c8yH1uGmfAZJjFR2XW7gIqqJRVMreUJpxGENfxh Ib5mMga8YJH1Ok2O1fofbkIqqm3H/MQoz/AI40TvRLfG/2IwXjnZ909FAdQaSvcu43qh PwAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oIm3S1cY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h2si7610000edb.346.2019.09.23.14.42.25; Mon, 23 Sep 2019 14:42:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=oIm3S1cY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390316AbfIVSqw (ORCPT + 99 others); Sun, 22 Sep 2019 14:46:52 -0400 Received: from mail.kernel.org ([198.145.29.99]:43102 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390199AbfIVSqr (ORCPT ); Sun, 22 Sep 2019 14:46:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 81FBD21A4A; Sun, 22 Sep 2019 18:46:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178006; bh=Crki/rhPZBSSiGnUAfWFpCxUMjGFSdR3yUOWDXh92Rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oIm3S1cYk/aR1CRgjINalV9R0zuHRZ38IfDYD9lSaLODJ080xR7oQNThdBcX1uXKk esjr6mI5T2f40Nfoa9XgqNUAezy4rdQXaIkxhK0vXjrymXp2Knml5lK8TerG4hJKrq 2eupm4goe0QKkn9Wa6UDEkcLoP+FmiiwmcW6gUgY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , syzbot+2d4fc2a0c45ad8da7e99@syzkaller.appspotmail.com, Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 094/203] media: radio/si470x: kill urb on error Date: Sun, 22 Sep 2019 14:42:00 -0400 Message-Id: <20190922184350.30563-94-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hans Verkuil [ Upstream commit 0d616f2a3fdbf1304db44d451d9f07008556923b ] In the probe() function radio->int_in_urb was not killed if an error occurred in the probe sequence. It was also missing in the disconnect. This caused this syzbot issue: https://syzkaller.appspot.com/bug?extid=2d4fc2a0c45ad8da7e99 Reported-and-tested-by: syzbot+2d4fc2a0c45ad8da7e99@syzkaller.appspotmail.com Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/radio/si470x/radio-si470x-usb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c index 49073747b1e7b..fedff68d8c496 100644 --- a/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/drivers/media/radio/si470x/radio-si470x-usb.c @@ -734,7 +734,7 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, /* start radio */ retval = si470x_start_usb(radio); if (retval < 0) - goto err_all; + goto err_buf; /* set initial frequency */ si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */ @@ -749,6 +749,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, return 0; err_all: + usb_kill_urb(radio->int_in_urb); +err_buf: kfree(radio->buffer); err_ctrl: v4l2_ctrl_handler_free(&radio->hdl); @@ -822,6 +824,7 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf) mutex_lock(&radio->lock); v4l2_device_disconnect(&radio->v4l2_dev); video_unregister_device(&radio->videodev); + usb_kill_urb(radio->int_in_urb); usb_set_intfdata(intf, NULL); mutex_unlock(&radio->lock); v4l2_device_put(&radio->v4l2_dev); -- 2.20.1