summaryrefslogtreecommitdiff
path: root/net/dccp/Makefile
diff options
context:
space:
mode:
authorCong Wang <xiyou.wangcong@gmail.com>2018-06-07 13:39:49 -0700
committerChenbo Feng <fengc@google.com>2018-08-23 17:30:17 +0000
commit3a2ec581f8e1b2f2ea949d4de42b99945cac5972 (patch)
treee35e6496fa8b6c6af2c189358c0abfe0439fb128 /net/dccp/Makefile
parent37af2ff398acf2743e24d25a0ba20cfbf1c84d72 (diff)
UPSTREAM: 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) Signed-off-by: Chenbo Feng <fengc@google.com> Bug: 112220999 Test: syzcaller reproducer doesn't trigger the crash anymore Change-Id: I90bec1515889e0dfd23f94e3f29b366c7bbfcd11
Diffstat (limited to 'net/dccp/Makefile')
0 files changed, 0 insertions, 0 deletions