From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68C782BE05A for ; Mon, 1 Jun 2026 16:04:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780329893; cv=none; b=SJrO60G22OLGc3n/9pnwqr1g7YcuEuN7Pgo4lzm2qDmjyHJOtmHVtcAMLPe7GnC/9D5jbdrfQIzQd+qeB24dEFXLDNj8cNph17KFZ6J6Tr/GLPqhcb+q8Cj/b8wuEgNbn8oufYsZZrqwE2+s8HvV/l92JuQ015mOtEWTIYBH1qQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780329893; c=relaxed/simple; bh=aHSlynNNOZuvbUVL+iFi/u2g4QeTYEAf6UUSrCvbf1w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KXo+BHGuYHRZsBqKwmqq5NIB8MzwcAYSWD/UBFhW8uZe8yrFcATyp12R0tBGDdxFjaTAtbQhBRzGcjwrww9q1zcpMahAUvT0hUl4xsXCfrdVprkiROfRjm9GV/cJ6ezih1qU1j96yfaxkBcjdM2ecD1dtGtXFqXiFND7x9hWuMA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QccICUJk; arc=none smtp.client-ip=209.85.161.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QccICUJk" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-69d92dbc420so5752125eaf.3 for ; Mon, 01 Jun 2026 09:04:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1780329891; x=1780934691; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nMzYIZJWaFBGzFwP0e88tdP74WtQK+Um062uqL3rcec=; b=QccICUJkiIwjF8anZt/RC/JeSzZah2Udw33ZutHPKgWpdkyLEtYJWrkGDz0ccZiXf7 UTFu0AEK5bmnCN+4tct3ZfZkEz5u80jEhHf6oPbsQv+m8lsZGPzZCWDnCakztuW7D4aT kCFlMXTWTDBfriiK9QkVN4Qyj3x1g0Jcsr1f14SrKjTQBy9YgqNyWrS/mc5l/CLHcBDe m7jWL9XKx1DpfStUPh40XyW7F0Pa4a7/ghkiSSsjdhEDiHZY2xXZkU0Q6yAh5PhCscjr F5XR50Zt8CtUrkAE+vwwZWjvmobPK3SHL+NwA9eKUr11RA8zDJqKN0Yzll/gNCHHn+uE aqbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1780329891; x=1780934691; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=nMzYIZJWaFBGzFwP0e88tdP74WtQK+Um062uqL3rcec=; b=dCesjFHerBgMab/1TS3siKl8fGQOrVPSwW2BDzu+KfG8AmPr0e4RLrxcr6iRZ6c5ej nxMguB0Lsmg9epr4+f0IEFrP5plU6gDNupauvzVanOSMGzbDMFRawriJ1x+Hn8FQwT8q 5EDz2mlzs+Qy1Lf9mRXg3O4c+U8kz7sBX+gkWxMtrA73t581+3yRetksWd+qle7sYoF1 Og5DGsSdG/wikLwYl9kX35Jj3exyprigQVa2NqLqtDJvYUkW3PrcKbN6I6ZHoPgXsX6M dEhRskPRQCfgavjZ0zhPt624QkcGG1rtgv1YJJzU0+lvvV71e4cPApJGAc3KlnbAoowF qzZA== X-Forwarded-Encrypted: i=1; AFNElJ+0WTe3PnoYDHAq4Ttx7oGRKYjjee9WzXOCqIq+jTdgN1o+e5cDTsAqq7BRbpAwkB9gGj1T5Pr++l/DHQ==@vger.kernel.org X-Gm-Message-State: AOJu0YxjnoxO5wzynPWKvZR1K872EtpL0Ybokz+A8IFGg2dd8cmNepGK u0N5gVmD7CQpz/duLY/QuR3r7AoMrvsNfS8iTgo/0Yt4tJ4zxt2vcQ1+ X-Gm-Gg: Acq92OGxHZJ8fMpxED/YrHr93G8uzYdKfqqcs/aTH9NQ2csFGoQVzb+w9oMsyW1C+Mb an6QxrjtkY8Zp+AZx+uDonpLY/cct1DLWHlGD19G8Ahg9RZMrrV32GlDyFVvMw2t+Qln9WoHHRB Jf1Us76vFhNf3kQl1Q2etMzpfR33OF2/H4HTku/JBoWjNhWnvrNyVqFzm/LxuUgxF0hw+5sUpPB wz2q2CqIDpF5Uvo2Vjq7BVa48V9ZVu75UO6FiCRaOrhzeXlWgU/DSnu6Zpo0UKzE7TkDp/N2LhU 29g/QZscIMZrPkreX5ifz/AG7yq89F9Bz4WriCcnyYT290uBytpOPUaSxjsH8lDRt8ipFesRR89 EYIdmrSkB8lhWfWJ4JJlMYO2JJPlmkeP0bVWtYF12HDSgo5A0IJnKAVDkjpjOpkRdfRl7XicG8J G0EOSXUG9iD79FcqM1QOBqjPjA+N25Snixio4YqKmKdDIr7eTo++sdkrQFXfrJ6HNdU7YxbdkH0 vjT X-Received: by 2002:a05:6820:1849:b0:699:a28b:18ed with SMTP id 006d021491bc7-69e105a8bc6mr5949137eaf.48.1780329891269; Mon, 01 Jun 2026 09:04:51 -0700 (PDT) Received: from localhost.localdomain ([2600:4041:42f2:d000:5598:1322:a565:857b]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8ccea1c3873sm95972426d6.27.2026.06.01.09.04.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 01 Jun 2026 09:04:50 -0700 (PDT) From: Rohith Matam To: mchehab@kernel.org Cc: duoming@zju.edu.cn, hverkuil@kernel.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Rohith Matam , syzbot+0d6ef2b7ceb6014d756c@syzkaller.appspotmail.com Subject: [PATCH v5] media: siano: fix URB work teardown Date: Mon, 1 Jun 2026 12:04:47 -0400 Message-ID: <20260601160447.59917-1-rohithmatham@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260601154314.56784-1-rohithmatham@gmail.com> References: <20260601154314.56784-1-rohithmatham@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit smsusb_onresponse() reinitializes the URB work item immediately before scheduling it. If teardown races with a queued work item, cancel_work_sync() can observe workqueue state with WORK_STRUCT_PWQ still set and trip the workqueue warning reported by syzbot. The teardown path also has related lifetime bugs. URB_FREE_BUFFER makes USB core free a smscore-owned buffer, and a work item can submit an URB after usb_kill_urb() has already returned. If that submission fails, the worker keeps ownership of the smscore buffer and the streaming pipeline loses an URB. Initialize each work item before any error path can tear down the device, remove URB_FREE_BUFFER, stop resubmission before killing URBs, and kill URBs again after canceling work so any URB submitted by an already-running worker is completed before buffers and the device are freed. Return the smscore buffer if URB submission fails. During teardown, wake workers blocked in smscore_getbuffer() by adding an abortable buffer wait. Then cancel work before returning any URB-owned buffer to avoid racing with workers that are still using surb->cb. Fixes: ebad8e731c1c ("media: usb: siano: Fix use after free bugs caused by do_submit_urb") Reported-by: syzbot+0d6ef2b7ceb6014d756c@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=0d6ef2b7ceb6014d756c Signed-off-by: Rohith Matam --- Changes in v5: - Replace the v4 early-buffer-return ordering with an abortable smscore buffer wait so workers can exit before teardown returns surb->cb. Changes in v4: - During teardown, kill all URBs and return held buffers before canceling workers so smscore_getbuffer() waiters can wake and exit. Changes in v3: - Initialize work items before early probe error paths can call teardown. - Return the smscore buffer when URB submission fails. - Wake buffer waiters after returning the buffer, and use wake_up(). Changes in v2: - Initialize all work items before allocating URBs. - Remove URB_FREE_BUFFER from smscore-owned buffers. - Stop resubmission before teardown and kill URBs again after canceling work. drivers/media/common/siano/smscoreapi.c | 14 ++++++- drivers/media/common/siano/smscoreapi.h | 2 + drivers/media/usb/siano/smsusb.c | 55 +++++++++++++++++++------ 3 files changed, 58 insertions(+), 13 deletions(-) diff --git a/drivers/media/common/siano/smscoreapi.c b/drivers/media/common/siano/smscoreapi.c index 017629e3c..23be7347d 100644 --- a/drivers/media/common/siano/smscoreapi.c +++ b/drivers/media/common/siano/smscoreapi.c @@ -1644,6 +1644,18 @@ struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev) } EXPORT_SYMBOL_GPL(smscore_getbuffer); +struct smscore_buffer_t * +smscore_getbuffer_abortable(struct smscore_device_t *coredev, bool *abort) +{ + struct smscore_buffer_t *cb = NULL; + + wait_event(coredev->buffer_mng_waitq, + READ_ONCE(*abort) || (cb = get_entry(coredev))); + + return cb; +} +EXPORT_SYMBOL_GPL(smscore_getbuffer_abortable); + /* * return buffer descriptor to a pool * @@ -1654,8 +1666,8 @@ EXPORT_SYMBOL_GPL(smscore_getbuffer); */ void smscore_putbuffer(struct smscore_device_t *coredev, struct smscore_buffer_t *cb) { - wake_up_interruptible(&coredev->buffer_mng_waitq); list_add_locked(&cb->entry, &coredev->buffers, &coredev->bufferslock); + wake_up(&coredev->buffer_mng_waitq); } EXPORT_SYMBOL_GPL(smscore_putbuffer); diff --git a/drivers/media/common/siano/smscoreapi.h b/drivers/media/common/siano/smscoreapi.h index d945a2d6d..f8a9e6ef7 100644 --- a/drivers/media/common/siano/smscoreapi.h +++ b/drivers/media/common/siano/smscoreapi.h @@ -1117,6 +1117,8 @@ extern void smscore_onresponse(struct smscore_device_t *coredev, extern struct smscore_buffer_t *smscore_getbuffer(struct smscore_device_t *coredev); +struct smscore_buffer_t * +smscore_getbuffer_abortable(struct smscore_device_t *coredev, bool *abort); extern void smscore_putbuffer(struct smscore_device_t *coredev, struct smscore_buffer_t *cb); diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index 0fdc2e095..565543dbd 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c @@ -58,6 +58,8 @@ struct smsusb_device_t { unsigned char in_ep; unsigned char out_ep; enum smsusb_state state; + bool streaming; + bool stopping; }; static int smsusb_submit_urb(struct smsusb_device_t *dev, @@ -71,8 +73,14 @@ static void do_submit_urb(struct work_struct *work) { struct smsusb_urb_t *surb = container_of(work, struct smsusb_urb_t, wq); struct smsusb_device_t *dev = surb->dev; + int rc; - smsusb_submit_urb(dev, surb); + if (!READ_ONCE(dev->streaming)) + return; + + rc = smsusb_submit_urb(dev, surb); + if (rc < 0 && READ_ONCE(dev->streaming)) + pr_err("smsusb_submit_urb(...) failed\n"); } /* @@ -143,19 +151,22 @@ static void smsusb_onresponse(struct urb *urb) exit_and_resubmit: - INIT_WORK(&surb->wq, do_submit_urb); - schedule_work(&surb->wq); + if (READ_ONCE(dev->streaming)) + schedule_work(&surb->wq); } static int smsusb_submit_urb(struct smsusb_device_t *dev, struct smsusb_urb_t *surb) { + int rc; + if (!surb->cb) { /* This function can sleep */ - surb->cb = smscore_getbuffer(dev->coredev); + surb->cb = smscore_getbuffer_abortable(dev->coredev, + &dev->stopping); if (!surb->cb) { - pr_err("smscore_getbuffer(...) returned NULL\n"); - return -ENOMEM; + pr_debug("device is stopping\n"); + return -ESHUTDOWN; } } @@ -168,20 +179,33 @@ static int smsusb_submit_urb(struct smsusb_device_t *dev, smsusb_onresponse, surb ); - surb->urb->transfer_flags |= URB_FREE_BUFFER; + rc = usb_submit_urb(surb->urb, GFP_ATOMIC); + if (rc) { + smscore_putbuffer(dev->coredev, surb->cb); + surb->cb = NULL; + } - return usb_submit_urb(surb->urb, GFP_ATOMIC); + return rc; } static void smsusb_stop_streaming(struct smsusb_device_t *dev) { int i; - for (i = 0; i < MAX_URBS; i++) { + WRITE_ONCE(dev->streaming, false); + WRITE_ONCE(dev->stopping, true); + wake_up(&dev->coredev->buffer_mng_waitq); + + for (i = 0; i < MAX_URBS; i++) usb_kill_urb(dev->surbs[i].urb); - if (dev->surbs[i].wq.func) - cancel_work_sync(&dev->surbs[i].wq); + for (i = 0; i < MAX_URBS; i++) + cancel_work_sync(&dev->surbs[i].wq); + + for (i = 0; i < MAX_URBS; i++) + usb_kill_urb(dev->surbs[i].urb); + + for (i = 0; i < MAX_URBS; i++) { if (dev->surbs[i].cb) { smscore_putbuffer(dev->coredev, dev->surbs[i].cb); dev->surbs[i].cb = NULL; @@ -193,6 +217,9 @@ static int smsusb_start_streaming(struct smsusb_device_t *dev) { int i, rc; + WRITE_ONCE(dev->stopping, false); + WRITE_ONCE(dev->streaming, true); + for (i = 0; i < MAX_URBS; i++) { rc = smsusb_submit_urb(dev, &dev->surbs[i]); if (rc < 0) { @@ -401,6 +428,11 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) if (!dev) return -ENOMEM; + for (i = 0; i < MAX_URBS; i++) { + dev->surbs[i].dev = dev; + INIT_WORK(&dev->surbs[i].wq, do_submit_urb); + } + memset(¶ms, 0, sizeof(params)); usb_set_intfdata(intf, dev); dev->udev = interface_to_usbdev(intf); @@ -467,7 +499,6 @@ static int smsusb_init_device(struct usb_interface *intf, int board_id) /* initialize urbs */ for (i = 0; i < MAX_URBS; i++) { - dev->surbs[i].dev = dev; dev->surbs[i].urb = usb_alloc_urb(0, GFP_KERNEL); if (!dev->surbs[i].urb) goto err_unregister_device; -- 2.54.0