diff options
| author | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-12-15 13:05:43 +0300 |
|---|---|---|
| committer | Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2020-12-15 13:05:43 +0300 |
| commit | ae75a0431f822273ce5d3a574863c67503db5775 (patch) | |
| tree | 1361bf5e24d1d38f993c08583f42eda4fb28b42e /fs/efivarfs/inode.c | |
| parent | 91def3cce986238db7c06af083b8e9e30372a895 (diff) | |
| parent | 5fbd41d3bf123af6a135bdea564087ec0f563eb0 (diff) | |
| download | linux-ae75a0431f822273ce5d3a574863c67503db5775.tar.xz | |
Merge drm/drm-next into drm-misc-next
Required backmerge since we will be based on top of v5.11, and there
has been a request to backmerge already to upstream some features.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Diffstat (limited to 'fs/efivarfs/inode.c')
| -rw-r--r-- | fs/efivarfs/inode.c | 2 |
1 files changed, 2 insertions, 0 deletions
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) |