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 07C371A8F7B for ; Fri, 1 May 2026 23:27:32 +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=1777678053; cv=none; b=vBX1Mab9wMH/NFGZSnfHVv1sZsqCbjsosEPTmVgOv+5U6KVVGDiJpFNO//Lc20opLQVAB+6zwXpqVOCH7uBMs5VvKG4xC4n0JjfQl8yXGxpHt0BixDDLr7n5euxTrZYdqn/T7pkePSQb0O9QVBqEtUCBvFPv31Wfdf2vlNxnK6g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777678053; c=relaxed/simple; bh=RKECSSadus905GI5gso77btvGese57/h8veEqGIo8ls=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aAkx+mYODneV0glQgMTKLh47XMhQj/e23ZXGeTqF7QFlL2H4Eue/dP+4YR4m540vtmH7XTz1s26IF110Ec9frWvMPVa7MrogE3xJVoPbdkn8w7itqqK+BPSl9McFYtfgKbTwt9t49MRikXESDQ8fZ/sbE8J6xRnoF5RfetmXX70= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T2C7GmzH; 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="T2C7GmzH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1D864C2BCB4; Fri, 1 May 2026 23:27:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777678052; bh=RKECSSadus905GI5gso77btvGese57/h8veEqGIo8ls=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T2C7GmzHvixkIcsJPRfkzC41pqdq2/g26lcVU2nSEfkgJrQwR3I38ieUQ52ZfKNYx Znbnpz4ViSFLBpy0U4GTnC2pyzsy3AoW5xPmKdhE6m0EFyNIWgqvgE4d7eKhIB5kNV blY5RiG9F0hpNqM+oXLz2YihCgCsuZAKMC6+65ZJRaoLc0taypz5VWCgWxnUOHJNvE Sf8z3haBM08sDoL6Ltv/iTplEhZMsKBqbckck88YSG3W4o6eYictpvHS8VLW30Gjtj +ae+2Ln6ss+dMeV+mB9kQ0as6fYMBde48r7TJmmUFGlz/hN3qQdUUITk1s282xFDfZ U8pIcOFtdwU5Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Oliver Neukum , Sean Young , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1.y] media: rc: igorplugusb: heed coherency rules Date: Fri, 1 May 2026 19:27:30 -0400 Message-ID: <20260501232730.4096516-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050150-amends-reapply-fc5a@gregkh> References: <2026050150-amends-reapply-fc5a@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Oliver Neukum [ Upstream commit eac69475b01fe1e861dfe3960b57fa95671c132e ] In a control request, the USB request structure can be subject to DMA on some HCs. Hence it must obey the rules for DMA coherency. Allocate it separately. Fixes: b1c97193c6437 ("[media] rc: port IgorPlug-USB to rc-core") Cc: stable@vger.kernel.org Signed-off-by: Oliver Neukum Signed-off-by: Sean Young Signed-off-by: Hans Verkuil [ replaced kzalloc_obj(*ir->request, GFP_KERNEL) with kzalloc(sizeof(*ir->request), GFP_KERNEL) ] Signed-off-by: Sasha Levin --- drivers/media/rc/igorplugusb.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c index 1464ef9c55bcd..f3616607d4f52 100644 --- a/drivers/media/rc/igorplugusb.c +++ b/drivers/media/rc/igorplugusb.c @@ -34,7 +34,7 @@ struct igorplugusb { struct device *dev; struct urb *urb; - struct usb_ctrlrequest request; + struct usb_ctrlrequest *request; struct timer_list timer; @@ -122,7 +122,7 @@ static void igorplugusb_cmd(struct igorplugusb *ir, int cmd) { int ret; - ir->request.bRequest = cmd; + ir->request->bRequest = cmd; ir->urb->transfer_flags = 0; ret = usb_submit_urb(ir->urb, GFP_ATOMIC); if (ret && ret != -EPERM) @@ -164,13 +164,17 @@ static int igorplugusb_probe(struct usb_interface *intf, if (!ir) return -ENOMEM; + ir->request = kzalloc(sizeof(*ir->request), GFP_KERNEL); + if (!ir->request) + goto fail; + ir->dev = &intf->dev; timer_setup(&ir->timer, igorplugusb_timer, 0); - ir->request.bRequest = GET_INFRACODE; - ir->request.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN; - ir->request.wLength = cpu_to_le16(MAX_PACKET); + ir->request->bRequest = GET_INFRACODE; + ir->request->bRequestType = USB_TYPE_VENDOR | USB_DIR_IN; + ir->request->wLength = cpu_to_le16(MAX_PACKET); ir->urb = usb_alloc_urb(0, GFP_KERNEL); if (!ir->urb) @@ -228,6 +232,7 @@ static int igorplugusb_probe(struct usb_interface *intf, usb_free_urb(ir->urb); rc_free_device(ir->rc); kfree(ir->buf_in); + kfree(ir->request); return ret; } @@ -243,6 +248,7 @@ static void igorplugusb_disconnect(struct usb_interface *intf) usb_unpoison_urb(ir->urb); usb_free_urb(ir->urb); kfree(ir->buf_in); + kfree(ir->request); } static const struct usb_device_id igorplugusb_table[] = { -- 2.53.0