Date: Wednesday, December 2, 2020 @ 17:23:57 Author: heftig Revision: 402808
5.4.81-1 Modified: linux-lts/trunk/PKGBUILD Deleted: linux-lts/trunk/0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch ---------------------------------------------------------------+ 0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch | 55 ---------- PKGBUILD | 8 - 2 files changed, 3 insertions(+), 60 deletions(-) Deleted: 0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch =================================================================== --- 0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch 2020-12-02 17:23:51 UTC (rev 402807) +++ 0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch 2020-12-02 17:23:57 UTC (rev 402808) @@ -1,55 +0,0 @@ -From a163474e9b86c2c25f20733385d8b1d6de492a7f Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel <[email protected]> -Date: Wed, 25 Nov 2020 08:45:55 +0100 -Subject: efivarfs: revert "fix memory leak in efivarfs_create()" - -The memory leak addressed by commit fe5186cf12e3 is a false positive: -all allocations are recorded in a linked list, and freed when the -filesystem is unmounted. This leads to double frees, and as reported -by David, leads to crashes if SLUB is configured to self destruct when -double frees occur. - -So drop the redundant kfree() again, and instead, mark the offending -pointer variable so the allocation is ignored by kmemleak. - -Cc: Vamshi K Sthambamkadi <[email protected]> -Fixes: fe5186cf12e3 ("efivarfs: fix memory leak in efivarfs_create()") -Reported-by: David Laight <[email protected]> -Signed-off-by: Ard Biesheuvel <[email protected]> ---- - fs/efivarfs/inode.c | 2 ++ - fs/efivarfs/super.c | 1 - - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/fs/efivarfs/inode.c b/fs/efivarfs/inode.c -index 96c0c86f3fff..0297ad95eb5c 100644 ---- a/fs/efivarfs/inode.c -+++ b/fs/efivarfs/inode.c -@@ -7,6 +7,7 @@ - #include <linux/efi.h> - #include <linux/fs.h> - #include <linux/ctype.h> -+#include <linux/kmemleak.h> - #include <linux/slab.h> - #include <linux/uuid.h> - -@@ -103,6 +104,7 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, - var->var.VariableName[i] = '\0'; - - inode->i_private = var; -+ kmemleak_ignore(var); - - err = efivar_entry_add(var, &efivarfs_list); - if (err) -diff --git a/fs/efivarfs/super.c b/fs/efivarfs/super.c -index f943fd0b0699..15880a68faad 100644 ---- a/fs/efivarfs/super.c -+++ b/fs/efivarfs/super.c -@@ -21,7 +21,6 @@ LIST_HEAD(efivarfs_list); - static void efivarfs_evict_inode(struct inode *inode) - { - clear_inode(inode); -- kfree(inode->i_private); - } - - static const struct super_operations efivarfs_ops = { Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-02 17:23:51 UTC (rev 402807) +++ PKGBUILD 2020-12-02 17:23:57 UTC (rev 402808) @@ -1,8 +1,8 @@ # Maintainer: Andreas Radke <[email protected]> pkgbase=linux-lts -pkgver=5.4.80 -pkgrel=2 +pkgver=5.4.81 +pkgrel=1 pkgdesc='LTS Linux' url="https://www.kernel.org/"; arch=(x86_64) @@ -18,7 +18,6 @@ config # the main kernel config file 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch - 0003-efivarfs-revert-fix-memory-leak-in-efivarfs_create.patch sphinx-workaround.patch ) validpgpkeys=( @@ -26,12 +25,11 @@ '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) # https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc -sha256sums=('49da425c1f3c530fd3ff31d85a0461f6b6dc6e459f7faf3eee23e49a98ce64c7' +sha256sums=('9470bde475726996202d845a5fc3bc8bd3bb546bbc6816fb663fa73df25d8427' 'SKIP' '760ec068a7a1d8e6d4af17c2a77bd0bcec6198ba31e003f6304313d43e3632a0' 'b439f57b84bc98730c0265695abb92385ee4dcd35a5c00d4cb3d3155c75fb491' '4fd74bb2a7101d700fba91806141339d8c9e46a14f8fc1fe276cfb68f1eec0f5' - 'bc9e2f7e843a8fa87da0b1b40c7257cd92311f070fb255120c405ad257cff3ed' 'b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e') export KBUILD_BUILD_HOST=archlinux
