From: Daniel J Blueman <daniel.blueman@gmail.com>
To: Chris Mason <chris.mason@oracle.com>
Cc: Daniel J Blueman <daniel.blueman@gmail.com>,
Christian Brunner <chb@muc.de>, Josef Bacik <josef@redhat.com>,
linux-btrfs@vger.kernel.org
Subject: [PATCH, fixed] Prevent oopsing in posix_acl_valid()
Date: Wed, 4 May 2011 10:54:08 +0800 [thread overview]
Message-ID: <1304477648-14952-1-git-send-email-daniel.blueman@gmail.com> (raw)
If posix_acl_from_xattr() returns an error code, a negative address is
dereferenced causing an oops; fix by checking for an error code first.
Typo fixed; too much late-night coding.
Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
---
fs/btrfs/acl.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5d505aa..44ea5b9 100644
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -178,12 +178,13 @@ static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
if (value) {
acl = posix_acl_from_xattr(value, size);
+ if (IS_ERR(acl))
+ return PTR_ERR(acl);
+
if (acl) {
ret = posix_acl_valid(acl);
if (ret)
goto out;
- } else if (IS_ERR(acl)) {
- return PTR_ERR(acl);
}
}
--
1.7.4.1
next reply other threads:[~2011-05-04 2:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-04 2:54 Daniel J Blueman [this message]
2011-05-04 14:40 ` [PATCH, fixed] Prevent oopsing in posix_acl_valid() Josef Bacik
2011-05-10 5:42 ` Daniel J Blueman
2011-05-10 11:21 ` Chris Mason
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=1304477648-14952-1-git-send-email-daniel.blueman@gmail.com \
--to=daniel.blueman@gmail.com \
--cc=chb@muc.de \
--cc=chris.mason@oracle.com \
--cc=josef@redhat.com \
--cc=linux-btrfs@vger.kernel.org \
/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).