D10974.id28943.diff
No OneTemporary
Actions

Size

861 B

Referenced Files

None

Subscribers

None

D10974.id28943.diff
View Options

	Index: sys/fs/ext2fs/ext2_acl.c
	===================================================================
	--- sys/fs/ext2fs/ext2_acl.c
	+++ sys/fs/ext2fs/ext2_acl.c
	@@ -210,11 +210,6 @@
	int len;
	int error;

	- len = sizeof(*ap->a_aclp) + sizeof(struct ext2_acl_header);
	- value = malloc(len, M_ACL, M_WAITOK);
	- if (!value)
	- return (ENOMEM);
	-
	switch (ap->a_type) {
	case ACL_TYPE_DEFAULT:
	attrnamespace = POSIX1E_ACL_DEFAULT_EXTATTR_NAMESPACE;
	@@ -228,6 +223,11 @@
	return (EINVAL);
	}

	+ len = sizeof(*ap->a_aclp) + sizeof(struct ext2_acl_header);
	+ value = malloc(len, M_ACL, M_WAITOK);
	+ if (!value)
	+ return (ENOMEM);
	+
	error = vn_extattr_get(ap->a_vp, IO_NODELOCKED, attrnamespace, attrname,
	&len, value, ap->a_td);
	switch (error) {
	@@ -518,4 +518,4 @@
	}

	return (acl_posix1e_check(ap->a_aclp));
	-}
	\ No newline at end of file
	+}