diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-10-10 16:16:06 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:44 -0700 |
| commit | 61d7bb4e4a4270156763bd07f2ac0614f38b6579 (patch) | |
| tree | 94f0102f8dff2ce71ee32ed8d81a41cbb154c4cf | |
| parent | a464cbcbade3b0462d08f45c26a35848b253b325 (diff) | |
UBUNTU: SAUCE: efivars: efivarfs_create() ensure we drop our reference on inode on error
BugLink: http://bugs.launchpad.net/bugs/1063061
Acked-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.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 ccd12f5bdab..ed89b3f40a3 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, struct nameidata *nd) { - 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; } |