diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-01-11 19:49:27 +0100 |
| commit | 6cf4569ce3561dec560147e6051959d6896b23d1 (patch) | |
| tree | 2b3dca47673824975c35a708a6d9d24ff46a2771 /net/socket.c | |
| parent | 2e40795c3bf344cfb5220d94566205796e3ef19a (diff) | |
| parent | 42e0ebdef53d91891939a475c6ef23970829ff99 (diff) | |
Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.10
As well as the usual smattering of driver specific fixes collected since
the merge window this has one particularly important fix to the core for
handling of aux_devs which was broken during the merge window by some of
the componentization refactoring.
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c index 8487bf136e5c..a8c2307590b8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -537,7 +537,7 @@ int sockfs_setattr(struct dentry *dentry, struct iattr *iattr) { int err = simple_setattr(dentry, iattr); - if (!err) { + if (!err && (iattr->ia_valid & ATTR_UID)) { struct socket *sock = SOCKET_I(d_inode(dentry)); sock->sk->sk_uid = iattr->ia_uid; |