diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-09 10:12:53 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-01-09 10:12:53 -0800 |
| commit | cf0533acdaa9f10777759a36ce3e387019dda9a3 (patch) | |
| tree | 3c4fcaf56ac379c2a480645a928f7492bb862539 /net/socket.c | |
| parent | 712517177d3f0df8ff8e402241d0f5a69208a95b (diff) | |
| parent | d5ed6f6f5f92d98f1f4329ff1c5a19fbb0f25550 (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
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 66d984ac2991..1f69e48b1501 100644 --- a/net/socket.c +++ b/net/socket.c @@ -524,7 +524,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; |