github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

efi: Use sysfs_emit() not sprintf() to generate sysfs file contents

Browse Source 
Use sysfs_emit() where appropriate to generate the contents of EFI
related sysfs nodes. This is a more robust wrapper around sprintf()
designed for this purpose.

Reported-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel 2026-10-08 10:13:20 +02:00
parent 80779c1dca
commit 64217cbfc7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/platform/efi/efi.c
View File

@ -893,7 +893,7 @@ bool efi_is_table_address(unsigned long phys_addr)
static ssize_t name##_show(struct kobject *kobj, \
const struct kobj_attribute *attr, char *buf) \
{ \
return sprintf(buf, "0x%lx\n", EFI_FIELD(name)); \
return sysfs_emit(buf, "0x%lx\n", EFI_FIELD(name)); \
}
EFI_ATTR_SHOW(fw_vendor);

16
drivers/firmware/efi/efi.c
View File

@ -133,26 +133,26 @@ struct kobject *efi_kobj;
static ssize_t systab_show(struct kobject *kobj,
const struct kobj_attribute *attr, char *buf)
{
char *str = buf;
int offset = 0;
if (!kobj || !buf)
return -EINVAL;
if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
str += sprintf(str, "ACPI20=0x%lx\n", efi.acpi20);
offset = sysfs_emit(buf, "ACPI20=0x%lx\n", efi.acpi20);
if (efi.acpi != EFI_INVALID_TABLE_ADDR)
str += sprintf(str, "ACPI=0x%lx\n", efi.acpi);
offset += sysfs_emit_at(buf, offset, "ACPI=0x%lx\n", efi.acpi);
/*
* If both SMBIOS and SMBIOS3 entry points are implemented, the
* SMBIOS3 entry point shall be preferred, so we list it first to
* let applications stop parsing after the first match.
*/
if (efi.smbios3 != EFI_INVALID_TABLE_ADDR)
str += sprintf(str, "SMBIOS3=0x%lx\n", efi.smbios3);
offset += sysfs_emit_at(buf, offset, "SMBIOS3=0x%lx\n", efi.smbios3);
if (efi.smbios != EFI_INVALID_TABLE_ADDR)
str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
offset += sysfs_emit_at(buf, offset, "SMBIOS=0x%lx\n", efi.smbios);
return str - buf;
return offset;
}
static const struct kobj_attribute efi_attr_systab = __KOBJ_ATTR_RO_MODE(systab, 0400);
@ -160,7 +160,7 @@ static const struct kobj_attribute efi_attr_systab = __KOBJ_ATTR_RO_MODE(systab,
static ssize_t fw_platform_size_show(struct kobject *kobj,
const struct kobj_attribute *attr, char *buf)
{
return sprintf(buf, "%d\n", efi_enabled(EFI_64BIT) ? 64 : 32);
return sysfs_emit(buf, "%d\n", efi_enabled(EFI_64BIT) ? 64 : 32);
}
extern __weak const struct kobj_attribute efi_attr_fw_vendor;
@ -406,7 +406,7 @@ static ssize_t efi_runtime_show(struct kobject *kobj,
const struct kobj_attribute *attr,
char *buf)
{
return sprintf(buf, "%d\n", efi_enabled(EFI_RUNTIME_SERVICES));
return sysfs_emit(buf, "%d\n", efi_enabled(EFI_RUNTIME_SERVICES));
}
static ssize_t efi_runtime_store(struct kobject *kobj,