summaryrefslogtreecommitdiffstats
path: root/security/integrity
diff options
context:
space:
mode:
authorSeth Forshee <seth.forshee@canonical.com>2017-12-22 15:32:35 +0100
committerEric W. Biederman <ebiederm@xmission.com>2018-05-03 11:28:29 -0500
commita3a5c966a664dfde0393dd366c2cb916962d164f (patch)
treeb3a0bfcebdc687080bb7135ef040bf55b3044a7c /security/integrity
parent6da6c0db5316275015e8cc2959f12a17584aeb64 (diff)
downloadlinux-stable-a3a5c966a664dfde0393dd366c2cb916962d164f.tar.gz
linux-stable-a3a5c966a664dfde0393dd366c2cb916962d164f.tar.bz2
linux-stable-a3a5c966a664dfde0393dd366c2cb916962d164f.zip
evm: Don't update hmacs in user ns mounts
The kernel should not calculate new hmacs for mounts done by non-root users. Update evm_calc_hmac_or_hash() to refuse to calculate new hmacs for mounts for non-init user namespaces. Cc: linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: James Morris <james.l.morris@oracle.com> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com> Cc: "Serge E. Hallyn" <serge@hallyn.com> Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Dongsu Park <dongsu@kinvolk.io> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Diffstat (limited to 'security/integrity')
-rw-r--r--security/integrity/evm/evm_crypto.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index a46fba322340..facf9cdd577d 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -200,7 +200,8 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
int size;
bool ima_present = false;
- if (!(inode->i_opflags & IOP_XATTR))
+ if (!(inode->i_opflags & IOP_XATTR) ||
+ inode->i_sb->s_user_ns != &init_user_ns)
return -EOPNOTSUPP;
desc = init_desc(type);