From f7ff8865dd5ce32c2e9c081ac5c1cf5b23b26306 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Jan 2020 21:08:47 +0100 Subject: [PATCH] 4.4-stable patches added patches: alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch --- ...rn-comparison-of-an-unsigned-integer.patch | 37 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 38 insertions(+) create mode 100644 queue-4.4/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch diff --git a/queue-4.4/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch b/queue-4.4/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch new file mode 100644 index 00000000000..131ab0de2fb --- /dev/null +++ b/queue-4.4/alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch @@ -0,0 +1,37 @@ +From d60229d84846a8399257006af9c5444599f64361 Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Fri, 22 Nov 2019 13:13:54 +0000 +Subject: ALSA: cs4236: fix error return comparison of an unsigned integer + +From: Colin Ian King + +commit d60229d84846a8399257006af9c5444599f64361 upstream. + +The return from pnp_irq is an unsigned integer type resource_size_t +and hence the error check for a positive non-error code is always +going to be true. A check for a non-failure return from pnp_irq +should in fact be for (resource_size_t)-1 rather than >= 0. + +Addresses-Coverity: ("Unsigned compared against 0") +Fixes: a9824c868a2c ("[ALSA] Add CS4232 PnP BIOS support") +Signed-off-by: Colin Ian King +Link: https://lore.kernel.org/r/20191122131354.58042-1-colin.king@canonical.com +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/isa/cs423x/cs4236.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/sound/isa/cs423x/cs4236.c ++++ b/sound/isa/cs423x/cs4236.c +@@ -293,7 +293,8 @@ static int snd_cs423x_pnp_init_mpu(int d + } else { + mpu_port[dev] = pnp_port_start(pdev, 0); + if (mpu_irq[dev] >= 0 && +- pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) { ++ pnp_irq_valid(pdev, 0) && ++ pnp_irq(pdev, 0) != (resource_size_t)-1) { + mpu_irq[dev] = pnp_irq(pdev, 0); + } else { + mpu_irq[dev] = -1; /* disable interrupt */ diff --git a/queue-4.4/series b/queue-4.4/series index ce24a909091..b87e34b750a 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -18,3 +18,4 @@ locks-print-unsigned-ino-in-proc-locks.patch dmaengine-fix-access-to-uninitialized-dma_slave_caps.patch compat_ioctl-block-handle-persistent-reservations.patch gpiolib-fix-up-emulated-open-drain-outputs.patch +alsa-cs4236-fix-error-return-comparison-of-an-unsigned-integer.patch -- 2.47.3