* [PATCH, fixed] Prevent oopsing in posix_acl_valid()
@ 2011-05-04 2:54 Daniel J Blueman
2011-05-04 14:40 ` Josef Bacik
0 siblings, 1 reply; 4+ messages in thread
From: Daniel J Blueman @ 2011-05-04 2:54 UTC (permalink / raw)
To: Chris Mason; +Cc: Daniel J Blueman, Christian Brunner, Josef Bacik, linux-btrfs
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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH, fixed] Prevent oopsing in posix_acl_valid()
2011-05-04 2:54 [PATCH, fixed] Prevent oopsing in posix_acl_valid() Daniel J Blueman
@ 2011-05-04 14:40 ` Josef Bacik
2011-05-10 5:42 ` Daniel J Blueman
0 siblings, 1 reply; 4+ messages in thread
From: Josef Bacik @ 2011-05-04 14:40 UTC (permalink / raw)
To: Daniel J Blueman; +Cc: Chris Mason, Christian Brunner, linux-btrfs
On 05/03/2011 10:54 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 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);
> }
> }
>
Actually pulled this down and compiled it this time to make sure it
worked. You can add
Reviewed-by: Josef Bacik <josef@redhat.com>
Thanks,
Josef
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH, fixed] Prevent oopsing in posix_acl_valid()
2011-05-04 14:40 ` Josef Bacik
@ 2011-05-10 5:42 ` Daniel J Blueman
2011-05-10 11:21 ` Chris Mason
0 siblings, 1 reply; 4+ messages in thread
From: Daniel J Blueman @ 2011-05-10 5:42 UTC (permalink / raw)
To: Chris Mason; +Cc: Josef Bacik, Christian Brunner, linux-btrfs
Hi Chris,
On 4 May 2011 22:40, Josef Bacik <josef@redhat.com> wrote:
> On 05/03/2011 10:54 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 an error code firs=
t.
>>
>> Typo fixed; too much late-night coding.
>>
>> 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..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,
>>
>> =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))
>> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return PTR_ERR(acl);
>> +
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (acl) {
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0ret =3D posix_acl_val=
id(acl);
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (ret)
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0goto =
out;
>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 } else if (IS_ERR(acl)) {
>> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 return PTR_ERR(acl);
>> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0}
>> =A0 =A0 =A0 =A0}
>>
>
> Actually pulled this down and compiled it this time to make sure it w=
orked.
> =A0You can add
>
> Reviewed-by: Josef Bacik <josef@redhat.com>
Will this fix go upstream for the final 2.6.39, now that the last -rc
is already out? I hit it in two independent cases when rebooting after
other kernel crashes.
Thanks,
Daniel
--=20
Daniel J Blueman
--
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] 4+ messages in thread* Re: [PATCH, fixed] Prevent oopsing in posix_acl_valid()
2011-05-10 5:42 ` Daniel J Blueman
@ 2011-05-10 11:21 ` Chris Mason
0 siblings, 0 replies; 4+ messages in thread
From: Chris Mason @ 2011-05-10 11:21 UTC (permalink / raw)
To: Daniel J Blueman; +Cc: Josef Bacik, Christian Brunner, linux-btrfs
Excerpts from Daniel J Blueman's message of 2011-05-10 01:42:45 -0400:
> Hi Chris,
>=20
> On 4 May 2011 22:40, Josef Bacik <josef@redhat.com> wrote:
> > On 05/03/2011 10:54 PM, Daniel J Blueman wrote:
> >>
> >> If posix_acl_from_xattr() returns an error code, a negative addres=
s is
> >> dereferenced causing an oops; fix by checking for an error code fi=
rst.
> >>
> >> Typo fixed; too much late-night coding.
> >>
> >> Signed-off-by: Daniel J Blueman<daniel.blueman@gmail.com>
> >> ---
> >> =C2=A0fs/btrfs/acl.c | =C2=A0 =C2=A05 +++--
> >> =C2=A01 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,
> >>
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0if (value) {
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0acl =3D pos=
ix_acl_from_xattr(value, size);
> >> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 if (IS_ERR(acl)=
)
> >> + =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 return PTR_ERR(acl);
> >> +
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (acl) {
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0ret =3D posix_acl_valid(acl);
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0if (ret)
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out;
> >> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 } else if (IS_E=
RR(acl)) {
> >> - =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 return PTR_ERR(acl);
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> >> =C2=A0 =C2=A0 =C2=A0 =C2=A0}
> >>
> >
> > Actually pulled this down and compiled it this time to make sure it=
worked.
> > =C2=A0You can add
> >
> > Reviewed-by: Josef Bacik <josef@redhat.com>
>=20
> Will this fix go upstream for the final 2.6.39, now that the last -rc
> is already out? I hit it in two independent cases when rebooting afte=
r
> other kernel crashes.
Yes, I have one other patch to from Li Zefan that I will send along.
-chris
--
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] 4+ messages in thread
end of thread, other threads:[~2011-05-10 11:21 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-04 2:54 [PATCH, fixed] Prevent oopsing in posix_acl_valid() Daniel J Blueman
2011-05-04 14:40 ` Josef Bacik
2011-05-10 5:42 ` Daniel J Blueman
2011-05-10 11:21 ` Chris Mason
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).