summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2012-03-14 12:36:49 -0700
committerBrian Behlendorf <[email protected]>2012-03-15 15:18:29 -0700
commit77a405ae52e4a902f7cc3790e2a73d044c66d962 (patch)
treeb2c4a6c40139ec4c9b44fdb3d812993cbd839cf0
parent42cb3819f1a1f536105faac81ffc150f3da90a80 (diff)
Add missing NULL in zpl_xattr_handlers
The xattr_resolve_name() helper function expects the registered list of xattr handlers to be NULL terminated. This NULL was accidentally missing which could result in a NULL dereference. Interestingly this issue only manifested itself on certain 32-bit systems. Presumably on 64-bit kernels we just always happen to get lucky and the memory following the structure is zeroed. Signed-off-by: Brian Behlendorf <[email protected]> Issue #594
-rw-r--r--module/zfs/zpl_xattr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c
index dbe61df98..c03764fc5 100644
--- a/module/zfs/zpl_xattr.c
+++ b/module/zfs/zpl_xattr.c
@@ -674,4 +674,5 @@ xattr_handler_t *zpl_xattr_handlers[] = {
&zpl_xattr_acl_access_handler,
&zpl_xattr_acl_default_handler,
#endif /* HAVE_POSIX_ACLS */
+ NULL
};