diff options
| author | James Morris <james.morris@microsoft.com> | 2018-05-01 21:02:34 +0300 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-05-01 21:02:34 +0300 |
| commit | b3859ee18ed287170b66b19a78191f7312ec3470 (patch) | |
| tree | c52550132fdf6802b159531498bde8dcfbd26180 /security | |
| parent | b393a707c84bb56a7800c93849fd8b492f76ba42 (diff) | |
| parent | 6da6c0db5316275015e8cc2959f12a17584aeb64 (diff) | |
| download | linux-b3859ee18ed287170b66b19a78191f7312ec3470.tar.xz | |
Merge tag 'v4.17-rc3' into next-general
Merge to Linux v4.17-rc3 which has stability bugfix.
Diffstat (limited to 'security')
| -rw-r--r-- | security/commoncap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/commoncap.c b/security/commoncap.c index 48620c93d697..1ce701fcb3f3 100644 --- a/security/commoncap.c +++ b/security/commoncap.c @@ -449,6 +449,8 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, magic |= VFS_CAP_FLAGS_EFFECTIVE; memcpy(&cap->data, &nscap->data, sizeof(__le32) * 2 * VFS_CAP_U32); cap->magic_etc = cpu_to_le32(magic); + } else { + size = -ENOMEM; } } kfree(tmpbuf); |