提交 70946c4a 编写于 作者: S Sascha Hauer 提交者: Mimi Zohar

evm: check for remount ro in progress before writing

EVM might update the evm xattr while the VFS performs a remount to
readonly mode. This is not properly checked for, additionally check
the s_readonly_remount superblock flag before writing.

The bug can for example be observed with UBIFS. UBIFS checks the free
space on the device before and after a remount. With EVM enabled the
free space sometimes differs between both checks.
Signed-off-by: NSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: NMimi Zohar <zohar@linux.vnet.ibm.com>
上级 f5e51fa3
...@@ -124,6 +124,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, ...@@ -124,6 +124,7 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
struct evm_ima_xattr_data *xattr_data = NULL; struct evm_ima_xattr_data *xattr_data = NULL;
struct evm_ima_xattr_data calc; struct evm_ima_xattr_data calc;
enum integrity_status evm_status = INTEGRITY_PASS; enum integrity_status evm_status = INTEGRITY_PASS;
struct inode *inode;
int rc, xattr_len; int rc, xattr_len;
if (iint && (iint->evm_status == INTEGRITY_PASS || if (iint && (iint->evm_status == INTEGRITY_PASS ||
...@@ -178,12 +179,15 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry, ...@@ -178,12 +179,15 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
(const char *)xattr_data, xattr_len, (const char *)xattr_data, xattr_len,
calc.digest, sizeof(calc.digest)); calc.digest, sizeof(calc.digest));
if (!rc) { if (!rc) {
inode = d_backing_inode(dentry);
if (xattr_data->type == EVM_XATTR_PORTABLE_DIGSIG) { if (xattr_data->type == EVM_XATTR_PORTABLE_DIGSIG) {
if (iint) if (iint)
iint->flags |= EVM_IMMUTABLE_DIGSIG; iint->flags |= EVM_IMMUTABLE_DIGSIG;
evm_status = INTEGRITY_PASS_IMMUTABLE; evm_status = INTEGRITY_PASS_IMMUTABLE;
} else if (!IS_RDONLY(d_backing_inode(dentry)) && } else if (!IS_RDONLY(inode) &&
!IS_IMMUTABLE(d_backing_inode(dentry))) { !(inode->i_sb->s_readonly_remount) &&
!IS_IMMUTABLE(inode)) {
evm_update_evmxattr(dentry, xattr_name, evm_update_evmxattr(dentry, xattr_name,
xattr_value, xattr_value,
xattr_value_len); xattr_value_len);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册