Skip to content

Commit

Permalink
efivarfs: efivarfs_create() ensure we drop our reference on inode on …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Andy Whitcroft authored and Matt Fleming committed Oct 30, 2012
1 parent d142df0 commit 45a937a
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions drivers/firmware/efivars.c
Original file line number Diff line number Diff line change
Expand Up @@ -866,21 +866,23 @@ 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;

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;

Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit 45a937a

Please sign in to comment.