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 <firstname.lastname@example.org>
Cc: Tetsuo Handa <email@example.com>
Cc: Lorenzo Colitti <firstname.lastname@example.org>
Cc: Al Viro <email@example.com>
Signed-off-by: Cong Wang <firstname.lastname@example.org>
Signed-off-by: David S. Miller <email@example.com>
(cherry picked from commit 6d8c50dcb029872b298eea68cc6209c866fd3e14)
Signed-off-by: Guenter Roeck <firstname.lastname@example.org>
Reviewed-by: Zubin Mithra <email@example.com>
(cherry picked from commit b5977f05bff49451922de9e7ddd19679e61bdb57)
Trybot-Ready: Edward Jee <firstname.lastname@example.org>
Commit-Queue: Edward Jee <email@example.com>
Tested-by: Edward Jee <firstname.lastname@example.org>
1 file changed