commit 90947ef26fa689a3252aa8282a01f60648e70fdb
author Jeff Mahoney <jeffm@suse.com> Mon Feb 13 11:12:36 2006 -0500
committer Linus Torvalds <torvalds@g5.osdl.org> Mon Feb 13 08:56:01 2006 -0800
tree 317ab8984d68fed9e4ad6e259c44134907b3021a
parent 326a625748535c4cdb1c632b1dcb07030989a393

[PATCH] reiserfs: fix potential (unlikely) oops in reiserfs_get_acl

This fixes a potential oops if there is an error reported by
posix_acl_from_disk().  This is mostly theoretical due to the use of
magics and checksums in xattrs, but is still possible.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/reiserfs/xattr_acl.c

diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c
index 43de3ba..ab8894c 100644
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
@@ -228,7 +228,8 @@
 		acl = ERR_PTR(retval);
 	} else {
 		acl = posix_acl_from_disk(value, retval);
-		*p_acl = posix_acl_dup(acl);
+		if (!IS_ERR(acl))
+			*p_acl = posix_acl_dup(acl);
 	}
 
 	kfree(value);