From: Greg Kroah-Hartman Date: Thu, 19 May 2022 14:30:04 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.9.316~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15d77147a4dcfe3731217cf9390a5bb59d5c6a59;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: alsa-wavefront-proper-check-of-get_user-error.patch --- diff --git a/queue-4.14/alsa-wavefront-proper-check-of-get_user-error.patch b/queue-4.14/alsa-wavefront-proper-check-of-get_user-error.patch new file mode 100644 index 00000000000..7b8fa3abe66 --- /dev/null +++ b/queue-4.14/alsa-wavefront-proper-check-of-get_user-error.patch @@ -0,0 +1,36 @@ +From a34ae6c0660d3b96b0055f68ef74dc9478852245 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Tue, 10 May 2022 12:36:26 +0200 +Subject: ALSA: wavefront: Proper check of get_user() error + +From: Takashi Iwai + +commit a34ae6c0660d3b96b0055f68ef74dc9478852245 upstream. + +The antient ISA wavefront driver reads its sample patch data (uploaded +over an ioctl) via __get_user() with no good reason; likely just for +some performance optimizations in the past. Let's change this to the +standard get_user() and the error check for handling the fault case +properly. + +Reported-by: Linus Torvalds +Cc: +Link: https://lore.kernel.org/r/20220510103626.16635-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/isa/wavefront/wavefront_synth.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/isa/wavefront/wavefront_synth.c ++++ b/sound/isa/wavefront/wavefront_synth.c +@@ -1092,7 +1092,8 @@ wavefront_send_sample (snd_wavefront_t * + + if (dataptr < data_end) { + +- __get_user (sample_short, dataptr); ++ if (get_user(sample_short, dataptr)) ++ return -EFAULT; + dataptr += skip; + + if (data_is_unsigned) { /* GUS ? */ diff --git a/queue-4.14/series b/queue-4.14/series index 6bb852324d4..ecdb74ba367 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -9,3 +9,4 @@ arm-9191-1-arm-stacktrace-kasan-silence-kasan-warnin.patch mmc-core-specify-timeouts-for-bkops-and-cache_flush-for-emmc.patch mmc-block-use-generic_cmd6_time-when-modifying-inand_cmd38_arg_ext_csd.patch mmc-core-default-to-generic_cmd6_time-as-timeout-in-__mmc_switch.patch +alsa-wavefront-proper-check-of-get_user-error.patch