From: Greg Kroah-Hartman Date: Thu, 17 Sep 2020 07:42:33 +0000 (+0200) Subject: fuzz cleanup X-Git-Tag: v4.19.146~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c5d64854c0f01e8763e77c31199e37e442193d9;p=thirdparty%2Fkernel%2Fstable-queue.git fuzz cleanup --- diff --git a/queue-4.14/iio-adc-mcp3422-fix-locking-on-error-path.patch b/queue-4.14/iio-adc-mcp3422-fix-locking-on-error-path.patch index 143d2ed46fd..7ae957d2527 100644 --- a/queue-4.14/iio-adc-mcp3422-fix-locking-on-error-path.patch +++ b/queue-4.14/iio-adc-mcp3422-fix-locking-on-error-path.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/r/20200901093218.1500845-1-angelo.compagnucci@gmai Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/iio/adc/mcp3422.c | 4 +++- + drivers/iio/adc/mcp3422.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index 63de705086ed4..155db438b7ecb 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc, +@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m config &= ~MCP3422_PGA_MASK; config |= MCP3422_PGA_VALUE(adc->pga[req_channel]); ret = mcp3422_update_config(adc, config); @@ -37,6 +35,3 @@ index 63de705086ed4..155db438b7ecb 100644 msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } --- -2.25.1 - diff --git a/queue-4.14/iio-adc-mcp3422-fix-locking-scope.patch b/queue-4.14/iio-adc-mcp3422-fix-locking-scope.patch index 72274558d61..2c11493b8d2 100644 --- a/queue-4.14/iio-adc-mcp3422-fix-locking-scope.patch +++ b/queue-4.14/iio-adc-mcp3422-fix-locking-scope.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman if (req_channel != MCP3422_CHANNEL(adc->config)) { config = adc->config; config &= ~MCP3422_CHANNEL_MASK; -@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m +@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } diff --git a/queue-4.19/iio-adc-mcp3422-fix-locking-on-error-path.patch b/queue-4.19/iio-adc-mcp3422-fix-locking-on-error-path.patch index 1084ad374d8..2d298fef078 100644 --- a/queue-4.19/iio-adc-mcp3422-fix-locking-on-error-path.patch +++ b/queue-4.19/iio-adc-mcp3422-fix-locking-on-error-path.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/r/20200901093218.1500845-1-angelo.compagnucci@gmai Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/iio/adc/mcp3422.c | 4 +++- + drivers/iio/adc/mcp3422.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index 819f260115005..a5a687257c0b8 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc, +@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m config &= ~MCP3422_PGA_MASK; config |= MCP3422_PGA_VALUE(adc->pga[req_channel]); ret = mcp3422_update_config(adc, config); @@ -37,6 +35,3 @@ index 819f260115005..a5a687257c0b8 100644 msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } --- -2.25.1 - diff --git a/queue-4.19/iio-adc-mcp3422-fix-locking-scope.patch b/queue-4.19/iio-adc-mcp3422-fix-locking-scope.patch index 72274558d61..2c11493b8d2 100644 --- a/queue-4.19/iio-adc-mcp3422-fix-locking-scope.patch +++ b/queue-4.19/iio-adc-mcp3422-fix-locking-scope.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman if (req_channel != MCP3422_CHANNEL(adc->config)) { config = adc->config; config &= ~MCP3422_CHANNEL_MASK; -@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m +@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } diff --git a/queue-4.4/iio-adc-mcp3422-fix-locking-on-error-path.patch b/queue-4.4/iio-adc-mcp3422-fix-locking-on-error-path.patch index 0405cb72e80..8d910db7936 100644 --- a/queue-4.4/iio-adc-mcp3422-fix-locking-on-error-path.patch +++ b/queue-4.4/iio-adc-mcp3422-fix-locking-on-error-path.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/r/20200901093218.1500845-1-angelo.compagnucci@gmai Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/iio/adc/mcp3422.c | 4 +++- + drivers/iio/adc/mcp3422.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index 3555122008b44..21f37da8ba3d7 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -147,8 +147,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc, +@@ -145,8 +145,10 @@ static int mcp3422_read_channel(struct m config &= ~MCP3422_PGA_MASK; config |= MCP3422_PGA_VALUE(adc->pga[req_channel]); ret = mcp3422_update_config(adc, config); @@ -37,6 +35,3 @@ index 3555122008b44..21f37da8ba3d7 100644 msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } --- -2.25.1 - diff --git a/queue-4.4/iio-adc-mcp3422-fix-locking-scope.patch b/queue-4.4/iio-adc-mcp3422-fix-locking-scope.patch index a84be103a6f..c2b354233e9 100644 --- a/queue-4.4/iio-adc-mcp3422-fix-locking-scope.patch +++ b/queue-4.4/iio-adc-mcp3422-fix-locking-scope.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman if (req_channel != MCP3422_CHANNEL(adc->config)) { config = adc->config; config &= ~MCP3422_CHANNEL_MASK; -@@ -154,7 +152,11 @@ static int mcp3422_read_channel(struct m +@@ -152,7 +150,11 @@ static int mcp3422_read_channel(struct m msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } diff --git a/queue-4.9/iio-adc-mcp3422-fix-locking-on-error-path.patch b/queue-4.9/iio-adc-mcp3422-fix-locking-on-error-path.patch index 1683e7f2746..93c43779dc0 100644 --- a/queue-4.9/iio-adc-mcp3422-fix-locking-on-error-path.patch +++ b/queue-4.9/iio-adc-mcp3422-fix-locking-on-error-path.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/r/20200901093218.1500845-1-angelo.compagnucci@gmai Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/iio/adc/mcp3422.c | 4 +++- + drivers/iio/adc/mcp3422.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index 254135e077922..25f3e58cd4d05 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -148,8 +148,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc, +@@ -146,8 +146,10 @@ static int mcp3422_read_channel(struct m config &= ~MCP3422_PGA_MASK; config |= MCP3422_PGA_VALUE(adc->pga[req_channel]); ret = mcp3422_update_config(adc, config); @@ -37,6 +35,3 @@ index 254135e077922..25f3e58cd4d05 100644 msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } --- -2.25.1 - diff --git a/queue-4.9/iio-adc-mcp3422-fix-locking-scope.patch b/queue-4.9/iio-adc-mcp3422-fix-locking-scope.patch index 72274558d61..2c11493b8d2 100644 --- a/queue-4.9/iio-adc-mcp3422-fix-locking-scope.patch +++ b/queue-4.9/iio-adc-mcp3422-fix-locking-scope.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman if (req_channel != MCP3422_CHANNEL(adc->config)) { config = adc->config; config &= ~MCP3422_CHANNEL_MASK; -@@ -155,7 +153,11 @@ static int mcp3422_read_channel(struct m +@@ -153,7 +151,11 @@ static int mcp3422_read_channel(struct m msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } diff --git a/queue-5.8/iio-adc-mcp3422-fix-locking-on-error-path.patch b/queue-5.8/iio-adc-mcp3422-fix-locking-on-error-path.patch index 77f21723d65..2b66e090650 100644 --- a/queue-5.8/iio-adc-mcp3422-fix-locking-on-error-path.patch +++ b/queue-5.8/iio-adc-mcp3422-fix-locking-on-error-path.patch @@ -18,14 +18,12 @@ Link: https://lore.kernel.org/r/20200901093218.1500845-1-angelo.compagnucci@gmai Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/iio/adc/mcp3422.c | 4 +++- + drivers/iio/adc/mcp3422.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/iio/adc/mcp3422.c b/drivers/iio/adc/mcp3422.c -index d86c0b5d80a3d..c717981c8fb03 100644 --- a/drivers/iio/adc/mcp3422.c +++ b/drivers/iio/adc/mcp3422.c -@@ -145,8 +145,10 @@ static int mcp3422_read_channel(struct mcp3422 *adc, +@@ -143,8 +143,10 @@ static int mcp3422_read_channel(struct m config &= ~MCP3422_PGA_MASK; config |= MCP3422_PGA_VALUE(adc->pga[req_channel]); ret = mcp3422_update_config(adc, config); @@ -37,6 +35,3 @@ index d86c0b5d80a3d..c717981c8fb03 100644 msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); } --- -2.25.1 - diff --git a/queue-5.8/iio-adc-mcp3422-fix-locking-scope.patch b/queue-5.8/iio-adc-mcp3422-fix-locking-scope.patch index 702837acf3b..11a69afa5c7 100644 --- a/queue-5.8/iio-adc-mcp3422-fix-locking-scope.patch +++ b/queue-5.8/iio-adc-mcp3422-fix-locking-scope.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman if (req_channel != MCP3422_CHANNEL(adc->config)) { config = adc->config; config &= ~MCP3422_CHANNEL_MASK; -@@ -152,7 +150,11 @@ static int mcp3422_read_channel(struct m +@@ -150,7 +148,11 @@ static int mcp3422_read_channel(struct m msleep(mcp3422_read_times[MCP3422_SAMPLE_RATE(adc->config)]); }