| commit | 047843bdb3160e8fb225f3752616ac7257033fe4 | [log] [tgz] |
|---|---|---|
| author | James Morris <jamorris@linux.microsoft.com> | Thu Apr 22 12:32:52 2021 -0700 |
| committer | James Morris <jamorris@linux.microsoft.com> | Thu Apr 22 12:32:52 2021 -0700 |
| tree | 3c9ae4aa43dfedb34abaf43750d80957eee8e863 | |
| parent | 237f61b788d3cff546216f53cc7d8a296994b2f1 [diff] | |
| parent | 3532b0b4352ce79400b0aa68414f1a0fc422b920 [diff] |
Merge branch 'landlock_lsm_v34' into next-testing Added flags to landlock_create_ruleset(2) to allow for future changes to ruleset format.
diff --git a/security/commoncap.c b/security/commoncap.c index 1c519c8..5cdeb73 100644 --- a/security/commoncap.c +++ b/security/commoncap.c
@@ -400,7 +400,7 @@ &tmpbuf, size, GFP_NOFS); dput(dentry); - if (ret < 0) + if (ret < 0 || !tmpbuf) return ret; fs_ns = inode->i_sb->s_user_ns;