diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 01:34:26 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | 6062d858929df927e244280ec4864b35a217d6d1 (patch) | |
tree | 6ff4342b85f5b4953b16f9561176d2ea0f1b4fa2 /target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch | |
parent | ce958dd88a7e74cd7aa7c345c97c79556bc2d926 (diff) | |
download | upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.gz upstream-6062d858929df927e244280ec4864b35a217d6d1.tar.bz2 upstream-6062d858929df927e244280ec4864b35a217d6d1.zip |
kernel: Update kernel 4.19 to version 4.19.131
Fixes:
- CVE-2020-10757
The "mtd: rawnand: Pass a nand_chip object to nand_release()" commit was
backported which needed some adaptations to other code.
Run tested: ath79
Build tested: ath79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch')
-rw-r--r-- | target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch b/target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch index 5d762c571c..811fe277dd 100644 --- a/target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch +++ b/target/linux/generic/backport-4.19/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch @@ -20,11 +20,9 @@ Signed-off-by: Christopher Hill <ch6574@gmail.com> drivers/spi/spi-rb4xx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c -index 4c9620e0d18c..17e1a77dc132 100644 --- a/drivers/spi/spi-rb4xx.c +++ b/drivers/spi/spi-rb4xx.c -@@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platform_device *pdev) +@@ -164,6 +164,11 @@ static int rb4xx_spi_probe(struct platfo master->transfer_one = rb4xx_transfer_one; master->set_cs = rb4xx_set_cs; @@ -36,7 +34,7 @@ index 4c9620e0d18c..17e1a77dc132 100644 err = devm_spi_register_master(&pdev->dev, master); if (err) { dev_err(&pdev->dev, "failed to register SPI master\n"); -@@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platform_device *pdev) +@@ -174,11 +179,6 @@ static int rb4xx_spi_probe(struct platfo if (err) return err; |