Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1548775 > unrolled thread
| Started by | Eric Biggers <ebiggers3@gmail.com> |
|---|---|
| First post | 2016-12-31 00:50 +0100 |
| Last post | 2017-01-01 18:00 +0100 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() Eric Biggers <ebiggers3@gmail.com> - 2016-12-31 00:50 +0100
Re: [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() David Miller <davem@davemloft.net> - 2016-12-31 18:40 +0100
Re: [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() Lorenzo Colitti <lorenzo@google.com> - 2017-01-01 09:00 +0100
Re: [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() David Miller <davem@davemloft.net> - 2017-01-01 18:00 +0100
| From | Eric Biggers <ebiggers3@gmail.com> |
|---|---|
| Date | 2016-12-31 00:50 +0100 |
| Subject | [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() |
| Message-ID | <sUf5T-2Uw-5@gated-at.bofh.it> |
From: Eric Biggers <ebiggers@google.com>
->setattr() was recently implemented for socket files to sync the socket
inode's uid to the new 'sk_uid' member of struct sock. It does this by
copying over the ia_uid member of struct iattr. However, ia_uid is
actually only valid when ATTR_UID is set in ia_valid, indicating that
the uid is being changed, e.g. by chown. Other metadata operations such
as chmod or utimes leave ia_uid uninitialized. Therefore, sk_uid could
be set to a "garbage" value from the stack.
Fix this by only copying the uid over when ATTR_UID is set.
Fixes: 86741ec25462 ("net: core: Add a UID field to struct sock.")
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
net/socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.11.0
[toc] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2016-12-31 18:40 +0100 |
| Subject | Re: [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() |
| Message-ID | <sUvNn-5UV-1@gated-at.bofh.it> |
| In reply to | #1548775 |
From: Eric Biggers <ebiggers3@gmail.com>
Date: Fri, 30 Dec 2016 17:42:32 -0600
> From: Eric Biggers <ebiggers@google.com>
>
> ->setattr() was recently implemented for socket files to sync the socket
> inode's uid to the new 'sk_uid' member of struct sock. It does this by
> copying over the ia_uid member of struct iattr. However, ia_uid is
> actually only valid when ATTR_UID is set in ia_valid, indicating that
> the uid is being changed, e.g. by chown. Other metadata operations such
> as chmod or utimes leave ia_uid uninitialized. Therefore, sk_uid could
> be set to a "garbage" value from the stack.
>
> Fix this by only copying the uid over when ATTR_UID is set.
>
> Fixes: 86741ec25462 ("net: core: Add a UID field to struct sock.")
> Signed-off-by: Eric Biggers <ebiggers@google.com>
Lorenzo, please review.
[toc] | [prev] | [next] | [standalone]
| From | Lorenzo Colitti <lorenzo@google.com> |
|---|---|
| Date | 2017-01-01 09:00 +0100 |
| Message-ID | <sUJdD-5XG-3@gated-at.bofh.it> |
| In reply to | #1548775 |
On Sat, Dec 31, 2016 at 8:42 AM, Eric Biggers <ebiggers3@gmail.com> wrote:
> ->setattr() was recently implemented for socket files to sync the socket
> inode's uid to the new 'sk_uid' member of struct sock. It does this by
> copying over the ia_uid member of struct iattr. However, ia_uid is
> actually only valid when ATTR_UID is set in ia_valid, indicating that
> the uid is being changed, e.g. by chown.
> [...]
> - if (!err) {
> + if (!err && (iattr->ia_valid & ATTR_UID)) {
Oops. Thanks for fixing this. Unit tested in
https://android-review.googlesource.com/316594 .
Tested-by: Lorenzo Colitti <lorenzo@google.com>
Acked-by: Lorenzo Colitti <lorenzo@google.com>
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-01-01 18:00 +0100 |
| Subject | Re: [PATCH] net: socket: don't set sk_uid to garbage value in ->setattr() |
| Message-ID | <sUREd-2NG-9@gated-at.bofh.it> |
| In reply to | #1548865 |
From: Lorenzo Colitti <lorenzo@google.com>
Date: Sun, 1 Jan 2017 16:57:23 +0900
> On Sat, Dec 31, 2016 at 8:42 AM, Eric Biggers <ebiggers3@gmail.com> wrote:
>> ->setattr() was recently implemented for socket files to sync the socket
>> inode's uid to the new 'sk_uid' member of struct sock. It does this by
>> copying over the ia_uid member of struct iattr. However, ia_uid is
>> actually only valid when ATTR_UID is set in ia_valid, indicating that
>> the uid is being changed, e.g. by chown.
>> [...]
>> - if (!err) {
>> + if (!err && (iattr->ia_valid & ATTR_UID)) {
>
> Oops. Thanks for fixing this. Unit tested in
> https://android-review.googlesource.com/316594 .
>
> Tested-by: Lorenzo Colitti <lorenzo@google.com>
> Acked-by: Lorenzo Colitti <lorenzo@google.com>
Applied, thanks everyone.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web