diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 00:54:41 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-07-04 21:12:42 +0200 |
commit | ce958dd88a7e74cd7aa7c345c97c79556bc2d926 (patch) | |
tree | 2a92f6397265cca8137812de80713ea1171287a6 /target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c | |
parent | 78b632134f1597e4cc6498a7bb913c4f9b036caf (diff) | |
download | upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.gz upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.tar.bz2 upstream-ce958dd88a7e74cd7aa7c345c97c79556bc2d926.zip |
kernel: Update kernel 4.14 to version 4.14.187
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.
Build tested: ramips
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c')
-rw-r--r-- | target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c index 74f7f2913e..a578c54ad3 100644 --- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c +++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c @@ -393,7 +393,7 @@ static int rb750_nand_probe(struct platform_device *pdev) return 0; err_release_nand: - nand_release(mtd); + nand_release(&info->chip); err_set_drvdata: platform_set_drvdata(pdev, NULL); err_free_info: @@ -405,7 +405,7 @@ static int rb750_nand_remove(struct platform_device *pdev) { struct rb750_nand_info *info = platform_get_drvdata(pdev); - nand_release(rbinfo_to_mtd(info)); + nand_release(&info->chip); platform_set_drvdata(pdev, NULL); kfree(info); |