hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SUNRPC: Fix an Oops in udp_poll() 

udp_poll() checks the struct file for the O_NONBLOCK flag, so we must not
call it with a NULL file pointer.

Fixes: 0ffe86f480 ("SUNRPC: Use poll() to fix up the socket requeue races")
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
Trond Myklebust 2019-02-26 06:33:02 -05:00
parent 06b5fc3ad9
commit a73881c96d
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sunrpc/xprtsock.h
View File

@ -26,6 +26,7 @@ struct sock_xprt {
*/ */
struct socket * sock; struct socket * sock;
struct sock * inet; struct sock * inet;
struct file * file;
/* /*
* State of TCP reply receive * State of TCP reply receive

21
net/sunrpc/xprtsock.c
View File

@ -670,7 +670,8 @@ out_err:
static __poll_t xs_poll_socket(struct sock_xprt *transport) static __poll_t xs_poll_socket(struct sock_xprt *transport)
{ {
return transport->sock->ops->poll(NULL, transport->sock, NULL); return transport->sock->ops->poll(transport->file, transport->sock,
NULL);
} }
static bool xs_poll_socket_readable(struct sock_xprt *transport) static bool xs_poll_socket_readable(struct sock_xprt *transport)
@ -1253,6 +1254,7 @@ static void xs_reset_transport(struct sock_xprt *transport)
struct socket *sock = transport->sock; struct socket *sock = transport->sock;
struct sock *sk = transport->inet; struct sock *sk = transport->inet;
struct rpc_xprt *xprt = &transport->xprt; struct rpc_xprt *xprt = &transport->xprt;
struct file *filp = transport->file;
if (sk == NULL) if (sk == NULL)
return; return;
@ -1266,6 +1268,7 @@ static void xs_reset_transport(struct sock_xprt *transport)
write_lock_bh(&sk->sk_callback_lock); write_lock_bh(&sk->sk_callback_lock);
transport->inet = NULL; transport->inet = NULL;
transport->sock = NULL; transport->sock = NULL;
transport->file = NULL;
sk->sk_user_data = NULL; sk->sk_user_data = NULL;
@ -1278,7 +1281,7 @@ static void xs_reset_transport(struct sock_xprt *transport)
mutex_unlock(&transport->recv_mutex); mutex_unlock(&transport->recv_mutex);
trace_rpc_socket_close(xprt, sock); trace_rpc_socket_close(xprt, sock);
sock_release(sock); fput(filp);
xprt_disconnect_done(xprt); xprt_disconnect_done(xprt);
} }
@ -1873,6 +1876,7 @@ static struct socket *xs_create_sock(struct rpc_xprt *xprt,
struct sock_xprt *transport, int family, int type, struct sock_xprt *transport, int family, int type,
int protocol, bool reuseport) int protocol, bool reuseport)
{ {
struct file *filp;
struct socket *sock; struct socket *sock;
int err; int err;
@ -1893,6 +1897,11 @@ static struct socket *xs_create_sock(struct rpc_xprt *xprt,
goto out; goto out;
} }
filp = sock_alloc_file(sock, O_NONBLOCK, NULL);
if (IS_ERR(filp))
return ERR_CAST(filp);
transport->file = filp;
return sock; return sock;
out: out:
return ERR_PTR(err); return ERR_PTR(err);
@ -1938,6 +1947,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt,
static int xs_local_setup_socket(struct sock_xprt *transport) static int xs_local_setup_socket(struct sock_xprt *transport)
{ {
struct rpc_xprt *xprt = &transport->xprt; struct rpc_xprt *xprt = &transport->xprt;
struct file *filp;
struct socket *sock; struct socket *sock;
int status = -EIO; int status = -EIO;
@ -1950,6 +1960,13 @@ static int xs_local_setup_socket(struct sock_xprt *transport)
} }
xs_reclassify_socket(AF_LOCAL, sock); xs_reclassify_socket(AF_LOCAL, sock);
filp = sock_alloc_file(sock, O_NONBLOCK, NULL);
if (IS_ERR(filp)) {
status = PTR_ERR(filp);
goto out;
}
transport->file = filp;
dprintk("RPC: worker connecting xprt %p via AF_LOCAL to %s\n", dprintk("RPC: worker connecting xprt %p via AF_LOCAL to %s\n",
xprt, xprt->address_strings[RPC_DISPLAY_ADDR]); xprt, xprt->address_strings[RPC_DISPLAY_ADDR]);