efivarfs fixes
Subsystems (2)
cover efivarfs fixes
From: Ard Biesheuvel <[email protected]>
Some fixes for efivarfs, most notably, a fix in patch #3 for a long standing issue reported by syzbot.
Ard Biesheuvel (3):
efivarfs: Move efivar availability check into FS context init
efivarfs: Free s_fs_info on unmount
efivarfs: Move efivarfs list into superblock s_fs_info
fs/efivarfs/inode.c | 3 +- fs/efivarfs/internal.h | 6 ++-- fs/efivarfs/super.c | 31 ++++++++++---------- fs/efivarfs/vars.c | 5 ++-- 4 files changed, 24 insertions(+), 21 deletions(-)
Signature · 1 line
2.43.0.472.g3155946c3a-goog
PATCH 1/3 efivarfs: Move efivar availability check into FS context init
From: Ard Biesheuvel <[email protected]>
Instead of checking whether or not EFI variables are available when creating the superblock, check it one step earlier, when initializing the FS context for the mount. This way, no FS context will be created at all, and we can drop the second check at .kill_sb() time entirely.
--- fs/efivarfs/super.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
fs/efivarfs/super.c +3 -6
@@ -295,9 +295,6 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)struct dentry *root;int err; -if (!efivar_is_available ()) -return -EOPNOTSUPP ; - sb->s_maxbytes =MAX_LFS_FILESIZE ; sb->s_blocksize =PAGE_SIZE ; sb->s_blocksize_bits =PAGE_SHIFT ;
@@ -342,6 +339,9 @@ static int efivarfs_init_fs_context(struct fs_context *fc) {struct efivarfs_fs_info *sfi; +if (!efivar_is_available ()) +return -EOPNOTSUPP ; + sfi =kzalloc (sizeof (*sfi),GFP_KERNEL );if (!sfi)return -ENOMEM ;
@@ -358,9 +358,6 @@ static void efivarfs_kill_sb(struct super_block *sb) {kill_litter_super (sb); -if (!efivar_is_available ()) -return ; -/* Remove all entries and destroy */ efivar_entry_iter (efivarfs_destroy, &efivarfs_list,NULL ); }
Signature · 1 line
2.43.0.472.g3155946c3a-goog
PATCH 2/3 efivarfs: Free s_fs_info on unmount
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
Now that we allocate a s_fs_info struct on fs context creation, we should ensure that we free it again when the superblock goes away.
--- fs/efivarfs/super.c | 3 +++ 1 file changed, 3 insertions(+)
fs/efivarfs/super.c +3 -0
@@ -356,10 +356,13 @@ static int efivarfs_init_fs_context(struct fs_context *fc)static void efivarfs_kill_sb (struct super_block *sb) { +struct efivarfs_fs_info *sfi = sb->s_fs_info; +kill_litter_super (sb);/* Remove all entries and destroy */ efivar_entry_iter (efivarfs_destroy, &efivarfs_list,NULL ); +kfree (sfi); }static struct file_system_type efivarfs_type = {
Signature · 1 line
2.43.0.472.g3155946c3a-goog
PATCH 3/3 efivarfs: Move efivarfs list into superblock s_fs_info
In reply to Ard BiesheuvelFrom: Ard Biesheuvel <[email protected]>
syzbot reports issues with concurrent fsopen()/fsconfig() invocations on efivarfs, which are the result of the fact that the efivarfs list (which caches the names and GUIDs of existing EFI variables) is a global structure. In normal use, these issues are unlikely to trigger, even in the presence of multiple mounts of efivarfs, but the execution pattern used by the syzkaller reproducer may result in multiple instances of the superblock that share the global efivarfs list, and this causes list corruption when the list is reinitialized by one user while another is traversing it.
So let's move the list head into the superblock s_fs_info field, so that it will never be shared between distinct instances of the superblock. In the common case, there will still be a single instance of this list, but in the artificial syzkaller case, no list corruption can occur any longer.
--- fs/efivarfs/inode.c | 3 ++- fs/efivarfs/internal.h | 6 +++--- fs/efivarfs/super.c | 19 ++++++++++--------- fs/efivarfs/vars.c | 5 +++-- 4 files changed, 18 insertions(+), 15 deletions(-)
fs/efivarfs/inode.c +2 -1
@@ -77,6 +77,7 @@ bool efivarfs_valid_name(const char *str, int len)static int efivarfs_create (struct mnt_idmap *idmap,struct inode *dir,struct dentry *dentry,umode_t mode,bool excl) { +struct efivarfs_fs_info *info = dir->i_sb->s_fs_info;struct inode *inode =NULL ;struct efivar_entry *var;int namelen, i =0 , err =0 ;
@@ -118,7 +119,7 @@ static int efivarfs_create(struct mnt_idmap *idmap, struct inode *dir, inode->i_private = var;kmemleak_ignore (var); - err =efivar_entry_add (var, &efivarfs_list); + err =efivar_entry_add (var, &info->efivarfs_list);if (err) goto out;
fs/efivarfs/internal.h +3 -3
@@ -16,6 +16,7 @@ struct efivarfs_mount_opts {struct efivarfs_fs_info {struct efivarfs_mount_opts mount_opts; +struct list_head efivarfs_list; };struct efi_variable {
@@ -33,7 +34,8 @@ struct efivar_entry {struct kobject kobj; }; -int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *), +int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *, +struct list_head *),void *data,bool duplicates,struct list_head *head);int efivar_entry_add (struct efivar_entry *entry,struct list_head *head);
@@ -64,6 +66,4 @@ extern struct inode *efivarfs_get_inode(struct super_block *sb, const struct inode *dir, int mode, dev_t dev, bool is_removable); -extern struct list_head efivarfs_list; -#endif /* EFIVAR_FS_INTERNAL_H */
fs/efivarfs/super.c +10 -9
@@ -18,8 +18,6 @@#include "internal.h" -LIST_HEAD (efivarfs_list); -static void efivarfs_evict_inode (struct inode *inode) {clear_inode (inode);
@@ -166,7 +164,8 @@ static struct dentry *efivarfs_alloc_dentry(struct dentry *parent, char *name) }static int efivarfs_callback (efi_char16_t *name16,efi_guid_t vendor, -unsigned long name_size,void *data) +unsigned long name_size,void *data, +struct list_head *list) {struct super_block *sb = (struct super_block *)data;struct efivar_entry *entry;
@@ -221,7 +220,7 @@ static int efivarfs_callback(efi_char16_t *name16, efi_guid_t vendor, }__efivar_entry_get (entry,NULL , &size,NULL ); -__efivar_entry_add (entry, &efivarfs_list); +__efivar_entry_add (entry, list);/* copied by the above to local storage in the dentry. */ kfree (name);
@@ -291,6 +290,7 @@ static int efivarfs_parse_param(struct fs_context *fc, struct fs_parameter *parastatic int efivarfs_fill_super (struct super_block *sb,struct fs_context *fc) { +struct efivarfs_fs_info *info = sb->s_fs_info;struct inode *inode =NULL ;struct dentry *root;int err;
@@ -316,11 +316,10 @@ static int efivarfs_fill_super(struct super_block *sb, struct fs_context *fc)if (!root)return -ENOMEM ; -INIT_LIST_HEAD (&efivarfs_list); - - err =efivar_init (efivarfs_callback, (void *)sb, true, &efivarfs_list); + err =efivar_init (efivarfs_callback, (void *)sb, true, + &info->efivarfs_list);if (err) -efivar_entry_iter (efivarfs_destroy, &efivarfs_list,NULL ); +efivar_entry_iter (efivarfs_destroy, &info->efivarfs_list,NULL );return err; }
@@ -346,6 +345,8 @@ static int efivarfs_init_fs_context(struct fs_context *fc)if (!sfi)return -ENOMEM ; +INIT_LIST_HEAD (&sfi->efivarfs_list); + sfi->mount_opts.uid =GLOBAL_ROOT_UID ; sfi->mount_opts.gid =GLOBAL_ROOT_GID ;
@@ -361,7 +362,7 @@ static void efivarfs_kill_sb(struct super_block *sb)kill_litter_super (sb);/* Remove all entries and destroy */ -efivar_entry_iter (efivarfs_destroy, &efivarfs_list,NULL ); +efivar_entry_iter (efivarfs_destroy, &sfi->efivarfs_list,NULL );kfree (sfi); }
fs/efivarfs/vars.c +3 -2
@@ -369,7 +369,8 @@ static void dup_variable_bug(efi_char16_t *str16, efi_guid_t *vendor_guid,* * Returns 0 on success, or a kernel error code on failure. */ -int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *), +int efivar_init (int (*func)(efi_char16_t *,efi_guid_t ,unsigned long ,void *, +struct list_head *),void *data,bool duplicates,struct list_head *head) {unsigned long variable_name_size =1024 ;
@@ -420,7 +421,7 @@ int efivar_init(int (*func)(efi_char16_t *, efi_guid_t, unsigned long, void *), status =EFI_NOT_FOUND ; }else { err =func (variable_name, vendor_guid, - variable_name_size, data); + variable_name_size, data, head);if (err) status =EFI_NOT_FOUND ; }
Signature · 1 line
2.43.0.472.g3155946c3a-goog