From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: "Benoît Sevens" <bsevens@google.com>, "Sasha Levin" <sashal@kernel.org>
Subject: Re: [PATCH 6.6.y] ALSA: usb-audio: Fix a DMA to stack memory bug
Date: Tue, 17 Dec 2024 07:55:36 -0500 [thread overview]
Message-ID: <20241217074127-0bfa41d9096d0a10@stable.kernel.org> (raw)
In-Reply-To: <20241217115858.688737-1-bsevens@google.com>
[ Sasha's backport helper bot ]
Hi,
Found matching upstream commit: f7d306b47a24367302bd4fe846854e07752ffcd9
WARNING: Author mismatch between patch and found commit:
Backport author: "=?UTF-8?q?Beno=C3=AEt=20Sevens?=" <bsevens@google.com>
Commit author: Dan Carpenter <dan.carpenter@linaro.org>
Status in newer kernel trees:
6.12.y | Present (different SHA1: 7f1292f8d4d6)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: f7d306b47a24 ! 1: 5164cdff6b91 ALSA: usb-audio: Fix a DMA to stack memory bug
@@ Commit message
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Link: https://patch.msgid.link/60e3aa09-039d-46d2-934c-6f123026c2eb@stanley.mountain
Signed-off-by: Takashi Iwai <tiwai@suse.de>
+ (cherry picked from commit f7d306b47a24367302bd4fe846854e07752ffcd9)
+ Signed-off-by: Benoît Sevens <bsevens@google.com>
## sound/usb/quirks.c ##
@@ sound/usb/quirks.c: int snd_usb_create_quirk(struct snd_usb_audio *chip,
@@ sound/usb/quirks.c: static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
err = usb_reset_configuration(dev);
if (err < 0)
-@@ sound/usb/quirks.c: static void mbox3_setup_defaults(struct usb_device *dev)
+@@ sound/usb/quirks.c: static void mbox3_setup_48_24_magic(struct usb_device *dev)
static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
{
struct usb_host_config *config = dev->actconfig;
@@ sound/usb/quirks.c: static void mbox3_setup_defaults(struct usb_device *dev)
@@ sound/usb/quirks.c: static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
- dev_dbg(&dev->dev, "MBOX3: device initialised!\n");
+ dev_dbg(&dev->dev, "device initialised!\n");
+ new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL);
+ if (!new_device_descriptor)
@@ sound/usb/quirks.c: static int snd_usb_mbox3_boot_quirk(struct usb_device *dev)
- &new_device_descriptor, sizeof(new_device_descriptor));
+ new_device_descriptor, sizeof(*new_device_descriptor));
if (err < 0)
- dev_dbg(&dev->dev, "MBOX3: error usb_get_descriptor: %d\n", err);
+ dev_dbg(&dev->dev, "error usb_get_descriptor: %d\n", err);
- if (new_device_descriptor.bNumConfigurations > dev->descriptor.bNumConfigurations)
+ if (new_device_descriptor->bNumConfigurations > dev->descriptor.bNumConfigurations)
- dev_dbg(&dev->dev, "MBOX3: error too large bNumConfigurations: %d\n",
+ dev_dbg(&dev->dev, "error too large bNumConfigurations: %d\n",
- new_device_descriptor.bNumConfigurations);
+ new_device_descriptor->bNumConfigurations);
else
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
prev parent reply other threads:[~2024-12-17 12:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-10 9:08 FAILED: patch "[PATCH] ALSA: usb-audio: Fix a DMA to stack memory bug" failed to apply to 6.6-stable tree gregkh
2024-12-17 11:58 ` [PATCH 6.6.y] ALSA: usb-audio: Fix a DMA to stack memory bug Benoît Sevens
2024-12-17 12:55 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241217074127-0bfa41d9096d0a10@stable.kernel.org \
--to=sashal@kernel.org \
--cc=bsevens@google.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.