diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-23 10:23:09 +0100 |
| commit | ec84f0056711efe93f034c86dd65e0de8d3531ff (patch) | |
| tree | 3e50d385d645487924bcac1f5fb33b496cda6dc0 /net/socket.c | |
| parent | sched/fair: Fix task group initialization (diff) | |
| parent | Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (diff) | |
| download | wireguard-linux-ec84f0056711efe93f034c86dd65e0de8d3531ff.tar.xz wireguard-linux-ec84f0056711efe93f034c86dd65e0de8d3531ff.zip | |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | net/socket.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/socket.c b/net/socket.c index 272518b087c8..73dc69f9681e 100644 --- a/net/socket.c +++ b/net/socket.c @@ -341,8 +341,23 @@ static const struct xattr_handler sockfs_xattr_handler = { .get = sockfs_xattr_get, }; +static int sockfs_security_xattr_set(const struct xattr_handler *handler, + struct dentry *dentry, struct inode *inode, + const char *suffix, const void *value, + size_t size, int flags) +{ + /* Handled by LSM. */ + return -EAGAIN; +} + +static const struct xattr_handler sockfs_security_xattr_handler = { + .prefix = XATTR_SECURITY_PREFIX, + .set = sockfs_security_xattr_set, +}; + static const struct xattr_handler *sockfs_xattr_handlers[] = { &sockfs_xattr_handler, + &sockfs_security_xattr_handler, NULL }; |