aboutsummaryrefslogtreecommitdiff
path: root/kernel/time
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2018-06-07 13:39:49 -0700
committerMoyster <oysterized@gmail.com>2019-07-08 13:36:43 +0200
commitb73919e115af86118d7f18ff5f48c8ab0397efea (patch)
treeea80b5cdc20511d4cdad1faf27ca5904ddc7fddd /kernel/time
parent48f7066fda2ea0c1fc07676fce86c910ef2ad7ca (diff)
BACKPORT: socket: close race condition between sock_close() and sockfs_setattr()
fchownat() doesn't even hold refcnt of fd until it figures out fd is really needed (otherwise is ignored) and releases it after it resolves the path. This means sock_close() could race with sockfs_setattr(), which leads to a NULL pointer dereference since typically we set sock->sk to NULL in ->release(). As pointed out by Al, this is unique to sockfs. So we can fix this in socket layer by acquiring inode_lock in sock_close() and checking against NULL in sockfs_setattr(). sock_release() is called in many places, only the sock_close() path matters here. And fortunately, this should not affect normal sock_close() as it is only called when the last fd refcnt is gone. It only affects sock_close() with a parallel sockfs_setattr() in progress, which is not common. Fixes: 86741ec25462 ("net: core: Add a UID field to struct sock.") Reported-by: shankarapailoor <shankarapailoor@gmail.com> Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> Cc: Lorenzo Colitti <lorenzo@google.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked from commit 6d8c50dcb029872b298eea68cc6209c866fd3e14) (use i_mutex directly instead of inode_lock()) Bug: 125367761 Test: used reproducer from Ied4bbca5c7eb80c201fec6e0aabc95c24acc1b59 Change-Id: Icf0824632734bd9d50dda65f87fc130c21b137ac Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions