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 565D01F755A for ; Tue, 17 Dec 2024 15:36:20 +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=1734449781; cv=none; b=p/PMuzet85wNzMqVczym6AIO6swXuNqzVNbEcJHMmC0jk/skbfnNuhL1/09vWpL5i7ZDfT/SwBxvYkbud3+GQH/O9JSGoJhxPruHvh7LDoJjqV6gFZimKbmXe1q+9u+fnhgnAIwQTEts1111V0I1F+7WyaS7hsw4EZchLeKt/DY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734449781; c=relaxed/simple; bh=8Kxxrkuxri10subbyHPTlx56p5zX8Ivuwj1MB2yeYHo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=AlaCBLFVtAac4zHt18J9/jG0BCCC17Vu6MIVaQc24n/y+u5HLzMDlJqppFNmoLZ55zmF2+wovUzwx4imYLvjvofSIdRC4zZ1cIMVLRX5SgdEycpE0TK3lcNojEaouNSLQEvy+Crr/Lr8GVMQup1jtEYiQAOZ71mibhv8DDVTZaY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N53lJWWj; 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="N53lJWWj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F5C4C4CED3; Tue, 17 Dec 2024 15:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1734449780; bh=8Kxxrkuxri10subbyHPTlx56p5zX8Ivuwj1MB2yeYHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N53lJWWjkPRMpbqVR/wyQiJUz7GHzSDf3qJN12rlyXU6m0pIdddI81iqL7m6Gxo9w LCr6DkBhQQG5GsmPVBd6d8QLnnzN9nIn6ld9waSiVD8AYidNwBaOVjz0KOD4NXSgY6 UKAuMFJU12nzxx4GrAv5ZN9NncqBOHCdmVyRIGb/Ggab+0ibfHYKrqwfKqnLY4b4tL HWvAF3dRaC1ayM/2SSFaIijHcAKqoi41boCaat0ezft2BCA9LGSMgd0+/PxZIt0WvF PfxramAa/Q/6QZiCarTu6+abk1WtgY83Oi2WJoqzq93UXs4JduNHX9py271O9SF6sR EAj3RpirIbTBw== From: Sasha Levin To: stable@vger.kernel.org Cc: "=?UTF-8?q?Beno=C3=AEt=20Sevens?=" , Sasha Levin Subject: Re: [PATCH 5.4.y] ALSA: usb-audio: Fix a DMA to stack memory bug Date: Tue, 17 Dec 2024 10:36:18 -0500 Message-Id: <20241217103429-9fcaddc25fa41c6e@stable.kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241217125219.747509-1-bsevens@google.com> References: Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ 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?=" Commit author: Dan Carpenter Status in newer kernel trees: 6.12.y | Present (different SHA1: 7f1292f8d4d6) 6.6.y | Not found 6.1.y | Not found 5.15.y | Not found 5.10.y | Not found 5.4.y | Not found Note: The patch differs from the upstream commit: --- 1: f7d306b47a24 ! 1: e539a25e17f7 ALSA: usb-audio: Fix a DMA to stack memory bug @@ Commit message Signed-off-by: Dan Carpenter Link: https://patch.msgid.link/60e3aa09-039d-46d2-934c-6f123026c2eb@stanley.mountain Signed-off-by: Takashi Iwai + (cherry picked from commit f7d306b47a24367302bd4fe846854e07752ffcd9) + [Benoît: there is no mbox3 suppport and no __free macro in 5.4] + Signed-off-by: Benoît Sevens ## sound/usb/quirks.c ## @@ sound/usb/quirks.c: int snd_usb_create_quirk(struct snd_usb_audio *chip, @@ sound/usb/quirks.c: int snd_usb_create_quirk(struct snd_usb_audio *chip, { struct usb_host_config *config = dev->actconfig; - struct usb_device_descriptor new_device_descriptor; -+ struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL; ++ struct usb_device_descriptor *new_device_descriptor = NULL; int err; if (le16_to_cpu(get_cfg_desc(config)->wTotalLength) == EXTIGY_FIRMWARE_SIZE_OLD || @@ sound/usb/quirks.c: static int snd_usb_extigy_boot_quirk(struct usb_device *dev, else - memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor)); + memcpy(&dev->descriptor, new_device_descriptor, sizeof(dev->descriptor)); ++ kfree(new_device_descriptor); err = usb_reset_configuration(dev); if (err < 0) dev_dbg(&dev->dev, "error usb_reset_configuration: %d\n", err); @@ sound/usb/quirks.c: static void mbox2_setup_48_24_magic(struct usb_device *dev) { struct usb_host_config *config = dev->actconfig; - struct usb_device_descriptor new_device_descriptor; -+ struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL; ++ struct usb_device_descriptor *new_device_descriptor = NULL; int err; u8 bootresponse[0x12]; int fwsize; @@ sound/usb/quirks.c: static int snd_usb_mbox2_boot_quirk(struct usb_device *dev) else - memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor)); + memcpy(&dev->descriptor, new_device_descriptor, sizeof(dev->descriptor)); - - err = usb_reset_configuration(dev); - if (err < 0) -@@ sound/usb/quirks.c: static void mbox3_setup_defaults(struct usb_device *dev) - static int snd_usb_mbox3_boot_quirk(struct usb_device *dev) - { - struct usb_host_config *config = dev->actconfig; -- struct usb_device_descriptor new_device_descriptor; -+ struct usb_device_descriptor *new_device_descriptor __free(kfree) = NULL; - int err; - int descriptor_size; - -@@ sound/usb/quirks.c: static int snd_usb_mbox3_boot_quirk(struct usb_device *dev) - - dev_dbg(&dev->dev, "MBOX3: device initialised!\n"); - -+ new_device_descriptor = kmalloc(sizeof(*new_device_descriptor), GFP_KERNEL); -+ if (!new_device_descriptor) -+ return -ENOMEM; -+ - err = usb_get_descriptor(dev, USB_DT_DEVICE, 0, -- &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); -- 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", -- new_device_descriptor.bNumConfigurations); -+ new_device_descriptor->bNumConfigurations); - else -- memcpy(&dev->descriptor, &new_device_descriptor, sizeof(dev->descriptor)); -+ memcpy(&dev->descriptor, new_device_descriptor, sizeof(dev->descriptor)); ++ kfree(new_device_descriptor); err = usb_reset_configuration(dev); if (err < 0) --- Results of testing on various branches: | Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-5.4.y | Success | Success |