diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-10-11 11:32:18 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-30 10:39:22 +0000 |
| commit | 45a937a883c4411648b80e87341b237cc48009c1 (patch) | |
| tree | adb0a27e66289e33fd191e93a90f4bb228f3981b | |
| parent | d142df03a798ee7d2db10a1f20945110ea6067ff (diff) | |
| download | blackbird-op-linux-45a937a883c4411648b80e87341b237cc48009c1.tar.gz blackbird-op-linux-45a937a883c4411648b80e87341b237cc48009c1.zip | |
efivarfs: efivarfs_create() ensure we drop our reference on inode on error
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | drivers/firmware/efivars.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index b7c9a3261dc4..6e5f367145f5 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -866,7 +866,7 @@ static void efivarfs_hex_to_guid(const char *str, efi_guid_t *guid) static int efivarfs_create(struct inode *dir, struct dentry *dentry, umode_t mode, bool excl) { - struct inode *inode = efivarfs_get_inode(dir->i_sb, dir, mode, 0); + struct inode *inode; struct efivars *efivars = &__efivars; struct efivar_entry *var; int namelen, i = 0, err = 0; @@ -874,13 +874,15 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, if (dentry->d_name.len < 38) return -EINVAL; + inode = efivarfs_get_inode(dir->i_sb, dir, mode, 0); if (!inode) return -ENOSPC; var = kzalloc(sizeof(struct efivar_entry), GFP_KERNEL); - - if (!var) - return -ENOMEM; + if (!var) { + err = -ENOMEM; + goto out; + } namelen = dentry->d_name.len - GUID_LEN; @@ -908,8 +910,10 @@ static int efivarfs_create(struct inode *dir, struct dentry *dentry, d_instantiate(dentry, inode); dget(dentry); out: - if (err) + if (err) { kfree(var); + iput(inode); + } return err; } |
