efivarfs: expose used and total size
Subsystems (2)
Sasha Levin
maintainerPATCH 1/3 efivarfs: expose used and total size
From: Anisse Astier <[email protected]>
[ Upstream commit d86ff3333cb1d5f42d8898fb5fdb304e143c0237 ]
When writing EFI variables, one might get errors with no other message on why it fails. Being able to see how much is used by EFI variables helps analyzing such issues.
Since this is not a conventional filesystem, block size is intentionally set to 1 instead of PAGE_SIZE.
x86 quirks of reserved size are taken into account; so that available and free size can be different, further helping debugging space issues.
With this patch, one can see the remaining space in EFI variable storage via efivarfs, like this:
$ df -h /sys/firmware/efi/efivars/ Filesystem Size Used Avail Use% Mounted on efivarfs 176K 106K 66K 62% /sys/firmware/efi/efivars
[ardb: - rename efi_reserved_space() to efivar_reserved_space()
- whitespace/coding style tweaks]
--- arch/x86/platform/efi/quirks.c | 8 +++++++ drivers/firmware/efi/efi.c | 1 + drivers/firmware/efi/vars.c | 12 +++++++++++ fs/efivarfs/super.c | 39 +++++++++++++++++++++++++++++++++- include/linux/efi.h | 11 ++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-)
arch/x86/platform/efi/quirks.c +8 -0
@@ -114,6 +114,14 @@ void efi_delete_dummy_variable(void) EFI_VARIABLE_RUNTIME_ACCESS, 0, NULL); } +u64 efivar_reserved_space (void ) +{ +if (efi_no_storage_paranoia) +return 0 ; +return EFI_MIN_RESERVE ; +} +EXPORT_SYMBOL_GPL (efivar_reserved_space); +/* * In the nonblocking case we do not attempt to perform garbage * collection if we do not have enough free space. Rather, we do the
drivers/firmware/efi/efi.c +1 -0
@@ -190,6 +190,7 @@ static int generic_ops_register(void) generic_ops.get_variable = efi.get_variable; generic_ops.get_next_variable = efi.get_next_variable; generic_ops.query_variable_store = efi_query_variable_store; + generic_ops.query_variable_info = efi.query_variable_info;if (efi_rt_services_supported (EFI_RT_SUPPORTED_SET_VARIABLE )) { generic_ops.set_variable = efi.set_variable;
drivers/firmware/efi/vars.c +12 -0
@@ -241,3 +241,15 @@ efi_status_t efivar_set_variable(efi_char16_t *name, efi_guid_t *vendor,return status; }EXPORT_SYMBOL_NS_GPL (efivar_set_variable,EFIVAR ); + +efi_status_t efivar_query_variable_info (u32 attr, +u64 *storage_space, +u64 *remaining_space, +u64 *max_variable_size) +{ +if (!__efivars->ops->query_variable_info) +return EFI_UNSUPPORTED ; +return __efivars->ops->query_variable_info (attr, storage_space, + remaining_space, max_variable_size); +} +EXPORT_SYMBOL_NS_GPL (efivar_query_variable_info,EFIVAR );
fs/efivarfs/super.c +38 -1
@@ -13,6 +13,7 @@#include <linux/ucs2_string.h> #include <linux/slab.h> #include <linux/magic.h> +#include <linux/statfs.h> #include "internal.h"
@@ -23,8 +24,44 @@ static void efivarfs_evict_inode(struct inode *inode)clear_inode (inode); } +static int efivarfs_statfs (struct dentry *dentry,struct kstatfs *buf) +{ +const u32 attr =EFI_VARIABLE_NON_VOLATILE | +EFI_VARIABLE_BOOTSERVICE_ACCESS | +EFI_VARIABLE_RUNTIME_ACCESS ; +u64 storage_space, remaining_space, max_variable_size; +efi_status_t status; + + status =efivar_query_variable_info (attr, &storage_space, &remaining_space, + &max_variable_size); +if (status !=EFI_SUCCESS ) +return efi_status_to_err (status); + +/* +* This is not a normal filesystem, so no point in pretending it has a block +* size; we declare f_bsize to 1, so that we can then report the exact value +* sent by EFI QueryVariableInfo in f_blocks and f_bfree +*/ + buf->f_bsize =1 ; + buf->f_namelen =NAME_MAX ; + buf->f_blocks = storage_space; + buf->f_bfree = remaining_space; + buf->f_type = dentry->d_sb->s_magic; + +/* +* In f_bavail we declare the free space that the kernel will allow writing +* when the storage_paranoia x86 quirk is active. To use more, users +* should boot the kernel with efi_no_storage_paranoia. +*/ +if (remaining_space >efivar_reserved_space ()) + buf->f_bavail = remaining_space -efivar_reserved_space (); +else + buf->f_bavail =0 ; + +return 0 ; +}static const struct super_operations efivarfs_ops = { - .statfs = simple_statfs, + .statfs = efivarfs_statfs, .drop_inode = generic_delete_inode, .evict_inode = efivarfs_evict_inode, };
include/linux/efi.h +11 -0
@@ -1045,6 +1045,7 @@ struct efivar_operations {efi_set_variable_t *set_variable;efi_set_variable_t *set_variable_nonblocking;efi_query_variable_store_t *query_variable_store; +efi_query_variable_info_t *query_variable_info; };struct efivars {
@@ -1053,6 +1054,12 @@ struct efivars {const struct efivar_operations *ops; }; +#ifdef CONFIG_X86 +u64 __attribute_const__ efivar_reserved_space(void); +#else +static inline u64 efivar_reserved_space (void ) {return 0 ; } +#endif +/* * The maximum size of VariableName + Data = 1024 * Therefore, it's reasonable to save that much
@@ -1087,6 +1094,10 @@ efi_status_t efivar_set_variable_locked(efi_char16_t *name, efi_guid_t *vendor,efi_status_t efivar_set_variable (efi_char16_t *name,efi_guid_t *vendor,u32 attr,unsigned long data_size,void *data); +efi_status_t efivar_query_variable_info (u32 attr,u64 *storage_space, +u64 *remaining_space, +u64 *max_variable_size); +#if IS_ENABLED (CONFIG_EFI_CAPSULE_LOADER )extern bool efi_capsule_pending (int *reset_type);
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 2/3 smb: client: fix warning in cifs_smb3_do_mount()
From: Paulo Alcantara <[email protected]>
[ Upstream commit 12c30f33cc6769bf411088a2872843c4f9ea32f9 ]
This fixes the following warning reported by kernel test robot
fs/smb/client/cifsfs.c:982 cifs_smb3_do_mount() warn: possible memory leak of 'cifs_sb'
--- fs/smb/client/cifsfs.c | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-)
fs/smb/client/cifsfs.c +10 -18
@@ -883,11 +883,11 @@ struct dentry * cifs_smb3_do_mount(struct file_system_type *fs_type, int flags, struct smb3_fs_context *old_ctx) { - int rc; -struct super_block *sb =NULL ; -struct cifs_sb_info *cifs_sb =NULL ; struct cifs_mnt_data mnt_data; +struct cifs_sb_info *cifs_sb; +struct super_block *sb;struct dentry *root; +int rc;/* * Prints in Kernel / CIFS log the attempted mount operation
@@ -898,11 +898,9 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,else cifs_info ("Attempting to mount %s\n" , old_ctx->UNC); - cifs_sb =kzalloc (sizeof (struct cifs_sb_info ),GFP_KERNEL ); -if (cifs_sb ==NULL ) { - root =ERR_PTR (-ENOMEM ); - goto out; - } + cifs_sb =kzalloc (sizeof (*cifs_sb),GFP_KERNEL ); +if (!cifs_sb) +return ERR_PTR (-ENOMEM ); cifs_sb->ctx =kzalloc (sizeof (struct smb3_fs_context ),GFP_KERNEL );if (!cifs_sb->ctx) {
@@ -945,10 +943,8 @@ cifs_smb3_do_mount(struct file_system_type *fs_type, sb =sget (fs_type, cifs_match_super, cifs_set_super, flags, &mnt_data);if (IS_ERR (sb)) { - root =ERR_CAST (sb);cifs_umount (cifs_sb); - cifs_sb =NULL ; - goto out; +return ERR_CAST (sb); }if (sb->s_root) {
@@ -979,13 +975,9 @@ cifs_smb3_do_mount(struct file_system_type *fs_type,deactivate_locked_super (sb);return root; out: -if (cifs_sb) { -if (!sb ||IS_ERR (sb)) {/* otherwise kill_sb will handle */ -kfree (cifs_sb->prepath); -smb3_cleanup_fs_context (cifs_sb->ctx); -kfree (cifs_sb); - } - } +kfree (cifs_sb->prepath); +smb3_cleanup_fs_context (cifs_sb->ctx); +kfree (cifs_sb);return root; }
Signature · 1 line
2.39.2
Sasha Levin
maintainerPATCH 3/3 cifs: fix session state check in reconnect to avoid use-after-free issue
In reply to Sasha LevinFrom: Winston Wen <[email protected]>
[ Upstream commit 99f280700b4cc02d5f141b8d15f8e9fad0418f65 ]
Don't collect exiting session in smb2_reconnect_server(), because it will be released soon.
Note that the exiting session will stay in server->smb_ses_list until it complete the cifs_free_ipc() and logoff() and then delete itself from the list.
--- fs/smb/client/smb2pdu.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/smb/client/smb2pdu.c +6 -0
@@ -3841,6 +3841,12 @@ void smb2_reconnect_server(struct work_struct *work)spin_lock (&cifs_tcp_ses_lock);list_for_each_entry (ses, &pserver->smb_ses_list, smb_ses_list) { +spin_lock (&ses->ses_lock); +if (ses->ses_status ==SES_EXITING ) { +spin_unlock (&ses->ses_lock); +continue ; + } +spin_unlock (&ses->ses_lock); tcon_selected = false;
Signature · 1 line
2.39.2