Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / firmware / efivars.c

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 9dc51ff..8ebce1c 100644 (file)
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -65,11 +65,10 @@
  *   v0.01 release to linux-ia64@linuxia64.org
  */
 
-#include <linux/config.h>
+#include <linux/capability.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/init.h>
-#include <linux/sched.h>               /* for capable() */
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/string.h>
@@ -352,7 +351,7 @@ static ssize_t efivar_attr_show(struct kobject *kobj, struct attribute *attr,
 {
        struct efivar_entry *var = to_efivar_entry(kobj);
        struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-       ssize_t ret = 0;
+       ssize_t ret = -EIO;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -368,7 +367,7 @@ static ssize_t efivar_attr_store(struct kobject *kobj, struct attribute *attr,
 {
        struct efivar_entry *var = to_efivar_entry(kobj);
        struct efivar_attribute *efivar_attr = to_efivar_attr(attr);
-       ssize_t ret = 0;
+       ssize_t ret = -EIO;
 
        if (!capable(CAP_SYS_ADMIN))
                return -EACCES;
@@ -568,20 +567,20 @@ systab_read(struct subsystem *entry, char *buf)
        if (!entry || !buf)
                return -EINVAL;
 
-       if (efi.mps)
-               str += sprintf(str, "MPS=0x%lx\n", __pa(efi.mps));
-       if (efi.acpi20)
-               str += sprintf(str, "ACPI20=0x%lx\n", __pa(efi.acpi20));
-       if (efi.acpi)
-               str += sprintf(str, "ACPI=0x%lx\n", __pa(efi.acpi));
-       if (efi.smbios)
-               str += sprintf(str, "SMBIOS=0x%lx\n", __pa(efi.smbios));
-       if (efi.hcdp)
-               str += sprintf(str, "HCDP=0x%lx\n", __pa(efi.hcdp));
-       if (efi.boot_info)
-               str += sprintf(str, "BOOTINFO=0x%lx\n", __pa(efi.boot_info));
-       if (efi.uga)
-               str += sprintf(str, "UGA=0x%lx\n", __pa(efi.uga));
+       if (efi.mps != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "MPS=0x%lx\n", efi.mps);
+       if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "ACPI20=0x%lx\n", efi.acpi20);
+       if (efi.acpi != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "ACPI=0x%lx\n", efi.acpi);
+       if (efi.smbios != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "SMBIOS=0x%lx\n", efi.smbios);
+       if (efi.hcdp != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "HCDP=0x%lx\n", efi.hcdp);
+       if (efi.boot_info != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "BOOTINFO=0x%lx\n", efi.boot_info);
+       if (efi.uga != EFI_INVALID_TABLE_ADDR)
+               str += sprintf(str, "UGA=0x%lx\n", efi.uga);
 
        return str - buf;
 }
@@ -614,16 +613,14 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
        char *short_name;
        struct efivar_entry *new_efivar;
 
-       short_name = kmalloc(short_name_size + 1, GFP_KERNEL);
-       new_efivar = kmalloc(sizeof(struct efivar_entry), GFP_KERNEL);
+       short_name = kzalloc(short_name_size + 1, GFP_KERNEL);
+       new_efivar = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL);
 
        if (!short_name || !new_efivar)  {
-               if (short_name)        kfree(short_name);
-               if (new_efivar)        kfree(new_efivar);
+               kfree(short_name);
+               kfree(new_efivar);
                return 1;
        }
-       memset(short_name, 0, short_name_size+1);
-       memset(new_efivar, 0, sizeof(struct efivar_entry));
 
        memcpy(new_efivar->var.VariableName, variable_name,
                variable_name_size);
@@ -644,7 +641,8 @@ efivar_create_sysfs_entry(unsigned long variable_name_size,
        kobj_set_kset_s(new_efivar, vars_subsys);
        kobject_register(&new_efivar->kobj);
 
-       kfree(short_name); short_name = NULL;
+       kfree(short_name);
+       short_name = NULL;
 
        spin_lock(&efivars_lock);
        list_add(&new_efivar->list, &efivar_list);
@@ -665,14 +663,20 @@ efivars_init(void)
 {
        efi_status_t status = EFI_NOT_FOUND;
        efi_guid_t vendor_guid;
-       efi_char16_t *variable_name = kmalloc(1024, GFP_KERNEL);
+       efi_char16_t *variable_name;
        struct subsys_attribute *attr;
        unsigned long variable_name_size = 1024;
-       int i, rc = 0, error = 0;
+       int i, error = 0;
 
        if (!efi_enabled)
                return -ENODEV;
 
+       variable_name = kzalloc(variable_name_size, GFP_KERNEL);
+       if (!variable_name) {
+               printk(KERN_ERR "efivars: Memory allocation failed.\n");
+               return -ENOMEM;
+       }
+
        printk(KERN_INFO "EFI Variables Facility v%s %s\n", EFIVARS_VERSION,
               EFIVARS_DATE);
 
@@ -680,21 +684,27 @@ efivars_init(void)
         * For now we'll register the efi subsys within this driver
         */
 
-       rc = firmware_register(&efi_subsys);
+       error = firmware_register(&efi_subsys);
 
-       if (rc)
-               return rc;
+       if (error) {
+               printk(KERN_ERR "efivars: Firmware registration failed with error %d.\n", error);
+               goto out_free;
+       }
 
        kset_set_kset_s(&vars_subsys, efi_subsys);
-       subsystem_register(&vars_subsys);
+
+       error = subsystem_register(&vars_subsys);
+
+       if (error) {
+               printk(KERN_ERR "efivars: Subsystem registration failed with error %d.\n", error);
+               goto out_firmware_unregister;
+       }
 
        /*
         * Per EFI spec, the maximum storage allocated for both
         * the variable name and variable data is 1024 bytes.
         */
 
-       memset(variable_name, 0, 1024);
-
        do {
                variable_name_size = 1024;
 
@@ -734,8 +744,20 @@ efivars_init(void)
                        error = subsys_create_file(&efi_subsys, attr);
        }
 
+       if (error)
+               printk(KERN_ERR "efivars: Sysfs attribute export failed with error %d.\n", error);
+       else
+               goto out_free;
+
+       subsystem_unregister(&vars_subsys);
+
+out_firmware_unregister:
+       firmware_unregister(&efi_subsys);
+
+out_free:
        kfree(variable_name);
-       return 0;
+
+       return error;
 }
 
 static void __exit