From: Sasha Levin Date: Sun, 7 Mar 2021 23:08:23 +0000 (-0500) Subject: Fixes for 4.14 X-Git-Tag: v5.4.104~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cc53d8b98bcf4ffb602a803da477e396de3ac2d;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch b/queue-4.14/alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch new file mode 100644 index 00000000000..39fb3420258 --- /dev/null +++ b/queue-4.14/alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch @@ -0,0 +1,46 @@ +From 7a5791e8cedc808a625a8627660b28e82bc2fceb Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 27 Feb 2021 00:15:27 +0000 +Subject: ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits + +From: Colin Ian King + +[ Upstream commit 26a9630c72ebac7c564db305a6aee54a8edde70e ] + +Currently the mask operation on variable conf is just 3 bits so +the switch statement case value of 8 is unreachable dead code. +The function daio_mgr_dao_init can be passed a 4 bit value, +function dao_rsc_init calls it with conf set to: + + conf = (desc->msr & 0x7) | (desc->passthru << 3); + +so clearly when desc->passthru is set to 1 then conf can be +at least 8. + +Fix this by changing the mask to 0xf. + +Fixes: 8cc72361481f ("ALSA: SB X-Fi driver merge") +Signed-off-by: Colin Ian King +Link: https://lore.kernel.org/r/20210227001527.1077484-1-colin.king@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/ctxfi/cthw20k2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c +index b866d6b2c923..e603db4d5ef3 100644 +--- a/sound/pci/ctxfi/cthw20k2.c ++++ b/sound/pci/ctxfi/cthw20k2.c +@@ -995,7 +995,7 @@ static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf) + + if (idx < 4) { + /* S/PDIF output */ +- switch ((conf & 0x7)) { ++ switch ((conf & 0xf)) { + case 1: + set_field(&ctl->txctl[idx], ATXCTL_NUC, 0); + break; +-- +2.30.1 + diff --git a/queue-4.14/rsxx-return-efault-if-copy_to_user-fails.patch b/queue-4.14/rsxx-return-efault-if-copy_to_user-fails.patch new file mode 100644 index 00000000000..bb115103497 --- /dev/null +++ b/queue-4.14/rsxx-return-efault-if-copy_to_user-fails.patch @@ -0,0 +1,50 @@ +From c3330d43c7c6b9bc2a90b5974b5e23676e76a3f2 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 3 Mar 2021 13:59:12 +0300 +Subject: rsxx: Return -EFAULT if copy_to_user() fails + +From: Dan Carpenter + +[ Upstream commit 77516d25f54912a7baedeeac1b1b828b6f285152 ] + +The copy_to_user() function returns the number of bytes remaining but +we want to return -EFAULT to the user if it can't complete the copy. +The "st" variable only holds zero on success or negative error codes on +failure so the type should be int. + +Fixes: 36f988e978f8 ("rsxx: Adding in debugfs entries.") +Signed-off-by: Dan Carpenter +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/block/rsxx/core.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/block/rsxx/core.c b/drivers/block/rsxx/core.c +index 6beafaa335c7..97b678c0ea13 100644 +--- a/drivers/block/rsxx/core.c ++++ b/drivers/block/rsxx/core.c +@@ -180,15 +180,17 @@ static ssize_t rsxx_cram_read(struct file *fp, char __user *ubuf, + { + struct rsxx_cardinfo *card = file_inode(fp)->i_private; + char *buf; +- ssize_t st; ++ int st; + + buf = kzalloc(cnt, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + st = rsxx_creg_read(card, CREG_ADD_CRAM + (u32)*ppos, cnt, buf, 1); +- if (!st) +- st = copy_to_user(ubuf, buf, cnt); ++ if (!st) { ++ if (copy_to_user(ubuf, buf, cnt)) ++ st = -EFAULT; ++ } + kfree(buf); + if (st) + return st; +-- +2.30.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 0c31fccb021..c569dcb5234 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -2,3 +2,5 @@ btrfs-raid56-simplify-tracking-of-q-stripe-presence.patch btrfs-fix-raid6-qstripe-kmap.patch pm-runtime-update-device-status-before-letting-suppliers-suspend.patch usbip-tools-fix-build-error-for-multiple-definition.patch +alsa-ctxfi-cthw20k2-fix-mask-on-conf-to-allow-4-bits.patch +rsxx-return-efault-if-copy_to_user-fails.patch