Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7ed6c43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security 

Pull security subsystem bugfixes from James Morris.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
  security/device_cgroup: lock assert fails in dev_exception_clean()
  evm: checking if removexattr is not a NULL
parents 9067ac85 103a197c

security/device_cgroup.c

+2 −0
Original line number Diff line number Diff line
@@ -215,7 +215,9 @@ static void devcgroup_css_free(struct cgroup *cgroup) 
	struct dev_cgroup *dev_cgroup;



	dev_cgroup = cgroup_to_devcgroup(cgroup);

	mutex_lock(&devcgroup_mutex);

	dev_exception_clean(dev_cgroup);

	mutex_unlock(&devcgroup_mutex);

	kfree(dev_cgroup);

}

security/integrity/evm/evm_crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ int evm_update_evmxattr(struct dentry *dentry, const char *xattr_name, 
		rc = __vfs_setxattr_noperm(dentry, XATTR_NAME_EVM,

					   &xattr_data,

					   sizeof(xattr_data), 0);

	}

	else if (rc == -ENODATA)

	} else if (rc == -ENODATA && inode->i_op->removexattr) {

		rc = inode->i_op->removexattr(dentry, XATTR_NAME_EVM);

	}

	return rc;

}