From: Andy Whitcroft <apw@canonical.com>
To: Matthew Garrett <mjg@redhat.com>,
Jeremy Kerr <jeremy.kerr@canonical.com>
Cc: Andy Whitcroft <apw@canonical.com>,
Matt Fleming <matt.fleming@intel.com>,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] efivarfs: efivarfs_fill_super() ensure we clean up correctly on error
Date: Thu, 11 Oct 2012 11:32:21 +0100 [thread overview]
Message-ID: <1349951541-20498-6-git-send-email-apw@canonical.com> (raw)
In-Reply-To: <1349951541-20498-1-git-send-email-apw@canonical.com>
Ensure we free both the name and inode on error when building the
individual variables.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
drivers/firmware/efivars.c | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index dcb34ae..0cad5d9 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -948,6 +948,7 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
struct dentry *root;
struct efivar_entry *entry, *n;
struct efivars *efivars = &__efivars;
+ char *name;
efivarfs_sb = sb;
@@ -969,16 +970,18 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
return -ENOMEM;
list_for_each_entry_safe(entry, n, &efivars->list, list) {
- struct inode *inode;
struct dentry *dentry, *root = efivarfs_sb->s_root;
- char *name;
unsigned long size = 0;
int len, i;
+ inode = NULL;
+
len = utf16_strlen(entry->var.VariableName);
/* GUID plus trailing NULL */
name = kmalloc(len + 38, GFP_ATOMIC);
+ if (!name)
+ goto fail;
for (i = 0; i < len; i++)
name[i] = entry->var.VariableName[i] & 0xFF;
@@ -991,7 +994,13 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
inode = efivarfs_get_inode(efivarfs_sb, root->d_inode,
S_IFREG | 0644, 0);
+ if (!inode)
+ goto fail_name;
+
dentry = d_alloc_name(root, name);
+ if (!dentry)
+ goto fail_inode;
+
/* copied by the above to local storage in the dentry. */
kfree(name);
@@ -1009,6 +1018,13 @@ int efivarfs_fill_super(struct super_block *sb, void *data, int silent)
}
return 0;
+
+fail_inode:
+ iput(inode);
+fail_name:
+ kfree(name);
+fail:
+ return -ENOMEM;
}
static struct dentry *efivarfs_mount(struct file_system_type *fs_type,
--
1.7.9.5
next prev parent reply other threads:[~2012-10-11 10:33 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-05 5:54 [PATCH 1/3] efi: Add support for a UEFI variable filesystem Jeremy Kerr
2012-10-05 5:54 ` [PATCH 2/3] efi: add efivars kobject to efi sysfs folder Jeremy Kerr
2012-10-05 6:51 ` joeyli
2012-10-05 7:44 ` Jeremy Kerr
2012-10-05 5:54 ` [PATCH 3/3] efi: Handle deletions and size changes in efivarfs_write_file Jeremy Kerr
2012-10-06 19:32 ` [PATCH 1/3] efi: Add support for a UEFI variable filesystem Matt Fleming
2012-10-11 10:32 ` [PATCH 0/5] efivarfs: fixes and cleanups Andy Whitcroft
2012-10-11 10:32 ` [PATCH 1/5] efivarfs: efivarfs_file_read ensure we free data in error paths Andy Whitcroft
2012-10-11 13:53 ` Jeremy Kerr
2012-10-11 10:32 ` [PATCH 2/5] efivarfs: efivarfs_create() ensure we drop our reference on inode on error Andy Whitcroft
2012-10-11 14:13 ` Jeremy Kerr
2012-10-12 19:03 ` Khalid Aziz
2012-10-12 19:21 ` Matt Fleming
2012-10-12 20:11 ` Khalid Aziz
2012-10-11 10:32 ` [PATCH 3/5] efivarfs: efivarfs_fill_super() fix inode reference counts Andy Whitcroft
2012-10-11 14:10 ` Jeremy Kerr
2012-10-11 10:32 ` [PATCH 4/5] efivarfs: efivarfs_fill_super() ensure we free our temporary name Andy Whitcroft
2012-10-11 13:59 ` Jeremy Kerr
2012-10-11 10:32 ` Andy Whitcroft [this message]
2012-10-11 14:04 ` [PATCH 5/5] efivarfs: efivarfs_fill_super() ensure we clean up correctly on error Jeremy Kerr
2012-10-11 16:06 ` Andy Whitcroft
2012-10-16 9:16 ` Jeremy Kerr
2012-10-11 12:40 ` [PATCH 0/5] efivarfs: fixes and cleanups Matthew Garrett
2012-10-11 12:48 ` Matt Fleming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1349951541-20498-6-git-send-email-apw@canonical.com \
--to=apw@canonical.com \
--cc=jeremy.kerr@canonical.com \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--cc=mjg@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).