From 04d2eaefe808abecd00fb70764a4dd92047667cb Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 27 Jan 2021 06:56:37 -0600 Subject: Turn VIRTIO_CONSOLE back on for s390 Signed-off-by: Justin M. Forbes --- configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE b/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE index 763c8331d..390e7e6d8 100644 --- a/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE +++ b/configs/fedora/generic/s390x/CONFIG_VIRTIO_CONSOLE @@ -1 +1 @@ -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 2042a7c8f..11ee60b43 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6639,7 +6639,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_FS is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 1d5d912df..c291da528 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6617,7 +6617,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_FS is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set -- cgit From 95c4ac556f898874ae5490dd83c1cc2684940af5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 27 Jan 2021 08:11:45 -0600 Subject: Linux v5.10.11 Signed-off-by: Justin M. Forbes --- kernel.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel.spec b/kernel.spec index 4c207810a..b116f377d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -94,7 +94,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 10 +%define stable_update 11 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2965,6 +2965,9 @@ fi # # %changelog +* Wed Jan 27 08:07:52 CST 2021 Justin M. Forbes - 5.10.11-100 +- Linux v5.10.11 + * Sun Jan 24 11:29:01 CST 2021 Justin M. Forbes - 5.10.10-100 - Linux v5.10.10 - Fixes CVE-2021-3178 (rhbz 1918179 1918181) diff --git a/sources b/sources index 97d31747a..e7e92f7a5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (linux-5.10.tar.xz) = c28d52bc0c1e2c99017ceeca0bf2e622427f3416e0692090b01f65e3b3a5bce0e3e52ce3cee15d71e84fcb965bd48bdfcccb818c0105035d712ebd07afde9452 -SHA512 (patch-5.10.10.xz) = 94e381026751a8fd0d38a7cb6816327df8bdf0448716f9e170737a4415a89dad9596e3007a90d3cbb2bf39c7ebb7d6c2157a8c1117623fbebfab01736265cf14 +SHA512 (patch-5.10.11.xz) = 313696af4792f9a314e7acedabd7f2c08e9605b274d94e4c92f36e69c42ecb506c35463f8224879d4a94536c973b8488b799d5f7e450cb792a04381eb88c8e66 -- cgit From 5d920aea2f864d57adfd10101ebdfe02053f94cf Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 27 Jan 2021 08:22:09 -0600 Subject: Fix URB buffer allocation of pwc driver (rhbz 1918778) Signed-off-by: Justin M. Forbes --- kernel.spec | 4 ++ media-pwc-fix-the-urb-buffer-allocation.patch | 58 +++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 media-pwc-fix-the-urb-buffer-allocation.patch diff --git a/kernel.spec b/kernel.spec index b116f377d..d2c6ebf0e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -852,6 +852,9 @@ Patch104: 0001-brcm-rpi4-fix-usb-numeration.patch # Nouveau mDP detection fix Patch107: 0001-drm-nouveau-kms-handle-mDP-connectors.patch +# rhbz 1918778 +Patch108: media-pwc-fix-the-urb-buffer-allocation.patch + # END OF PATCH DEFINITIONS %endif @@ -2967,6 +2970,7 @@ fi %changelog * Wed Jan 27 08:07:52 CST 2021 Justin M. Forbes - 5.10.11-100 - Linux v5.10.11 +- Fix URB buffer allocation of pwc driver (rhbz 1918778) * Sun Jan 24 11:29:01 CST 2021 Justin M. Forbes - 5.10.10-100 - Linux v5.10.10 diff --git a/media-pwc-fix-the-urb-buffer-allocation.patch b/media-pwc-fix-the-urb-buffer-allocation.patch new file mode 100644 index 000000000..413868bfb --- /dev/null +++ b/media-pwc-fix-the-urb-buffer-allocation.patch @@ -0,0 +1,58 @@ +From MAILER-DAEMON Wed Jan 27 14:16:57 2021 +From: Takashi Iwai +To: Hans Verkuil +Cc: Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org +Subject: [PATCH] media: pwc: Fix the URB buffer allocation +Date: Thu, 21 Jan 2021 21:28:55 +0100 +Message-Id: <20210121202855.17400-1-tiwai@suse.de> +List-ID: +X-Mailing-List: linux-media@vger.kernel.org +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 7bit + +The URB buffer allocation of pwc driver involves with the +dma_map_single(), and it needs to pass the right device. Currently it +passes usb_device.dev, but it's no real device that manages the DMA. +Since the passed device has no DMA mask set up, now the pwc driver +hits the WARN_ON_ONCE() check in dma_map_page_attrs() (that was +introduced in 5.10), resulting in an error at URB allocations. +Eventually this ended up with the black output. + +This patch fixes the bug by passing the proper device, the bus +controller, to make the URB allocation and map working again. + +Signed-off-by: Takashi Iwai +Reviewed-by: Robert Foss +Cc: +BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1181133 +--- + drivers/media/usb/pwc/pwc-if.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/usb/pwc/pwc-if.c b/drivers/media/usb/pwc/pwc-if.c +index 61869636ec61..d771160bb168 100644 +--- a/drivers/media/usb/pwc/pwc-if.c ++++ b/drivers/media/usb/pwc/pwc-if.c +@@ -461,7 +461,7 @@ static int pwc_isoc_init(struct pwc_device *pdev) + urb->pipe = usb_rcvisocpipe(udev, pdev->vendpoint); + urb->transfer_flags = URB_ISO_ASAP | URB_NO_TRANSFER_DMA_MAP; + urb->transfer_buffer_length = ISO_BUFFER_SIZE; +- urb->transfer_buffer = pwc_alloc_urb_buffer(&udev->dev, ++ urb->transfer_buffer = pwc_alloc_urb_buffer(udev->bus->controller, + urb->transfer_buffer_length, + &urb->transfer_dma); + if (urb->transfer_buffer == NULL) { +@@ -524,7 +524,7 @@ static void pwc_iso_free(struct pwc_device *pdev) + if (urb) { + PWC_DEBUG_MEMORY("Freeing URB\n"); + if (urb->transfer_buffer) +- pwc_free_urb_buffer(&urb->dev->dev, ++ pwc_free_urb_buffer(urb->dev->bus->controller, + urb->transfer_buffer_length, + urb->transfer_buffer, + urb->transfer_dma); +-- +2.26.2 + + -- cgit