* [PATCH] Prevent oopsing in posix_acl_valid()
@ 2011-05-03 16:44 Daniel J Blueman
2011-05-03 17:38 ` Josef Bacik
0 siblings, 1 reply; 3+ messages in thread
From: Daniel J Blueman @ 2011-05-03 16:44 UTC (permalink / raw)
To: linux-btrfs, chris.mason; +Cc: Daniel J Blueman
If posix_acl_from_xattr() returns an error code, a negative address is
dereferenced causing an oops; fix by checking for error code first.
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..cad6fbb 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Prevent oopsing in posix_acl_valid()
2011-05-03 16:44 [PATCH] Prevent oopsing in posix_acl_valid() Daniel J Blueman
@ 2011-05-03 17:38 ` Josef Bacik
2011-05-03 19:33 ` Christian Brunner
0 siblings, 1 reply; 3+ messages in thread
From: Josef Bacik @ 2011-05-03 17:38 UTC (permalink / raw)
To: Daniel J Blueman; +Cc: linux-btrfs, chris.mason
On 05/03/2011 12:44 PM, Daniel J Blueman wrote:
> If posix_acl_from_xattr() returns an error code, a negative address is
> dereferenced causing an oops; fix by checking for error code first.
>
> 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..cad6fbb 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);
> }
> }
>
Reviewed-by: Josef Bacik <josef@redhat.com>
Thanks,
Josef
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Prevent oopsing in posix_acl_valid()
2011-05-03 17:38 ` Josef Bacik
@ 2011-05-03 19:33 ` Christian Brunner
0 siblings, 0 replies; 3+ messages in thread
From: Christian Brunner @ 2011-05-03 19:33 UTC (permalink / raw)
To: Josef Bacik; +Cc: Daniel J Blueman, linux-btrfs, chris.mason
2011/5/3 Josef Bacik <josef@redhat.com>:
> On 05/03/2011 12:44 PM, Daniel J Blueman wrote:
>>
>> If posix_acl_from_xattr() returns an error code, a negative address =
is
>> dereferenced causing an oops; fix by checking for error code first.
>>
>> Signed-off-by: Daniel J Blueman<daniel.blueman@gmail.com>
>> ---
>> =A0fs/btrfs/acl.c | =A0 =A05 +++--
>> =A01 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
>> index 5d505aa..cad6fbb 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,
>>
>> =A0 =A0 =A0 =A0if (value) {
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0acl =3D posix_acl_from_xattr(value, s=
ize);
>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 if (IS_ERR(acl)
A small typo: The right parenthesis is missing.
Christian
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" =
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-03 19:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-03 16:44 [PATCH] Prevent oopsing in posix_acl_valid() Daniel J Blueman
2011-05-03 17:38 ` Josef Bacik
2011-05-03 19:33 ` Christian Brunner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.