SUNRPC: Do not dereference non-socket transports in sysfs
Subsystems (3)
[email protected]
maintainerPATCH v2 1/2 SUNRPC: Do not dereference non-socket transports in sysfs
From: Trond Myklebust <[email protected]>
Do not cast the struct xprt to a sock_xprt unless we know it is a UDP or TCP transport. Otherwise the call to lock the mutex will scribble over whatever structure is actually there. This has been seen to cause hard system lockups when the underlying transport was RDMA.
Fixes b49ea673e119 ("SUNRPC: lock against ->sock changing during sysfs read")
Signed-off-by Trond Myklebust <[email protected]>
--- include/linux/sunrpc/xprt.h | 3 ++ include/linux/sunrpc/xprtsock.h | 1 - net/sunrpc/sysfs.c | 50 +++++++++++++++++---------------- net/sunrpc/xprtsock.c | 26 +++++++++++++++-- 4 files changed, 53 insertions(+), 27 deletions(-)
include/linux/sunrpc/xprt.h +3 -0
@@ -139,6 +139,9 @@ struct rpc_xprt_ops {void (*rpcbind)(struct rpc_task *task);void (*set_port)(struct rpc_xprt *xprt,unsigned short port);void (*connect)(struct rpc_xprt *xprt,struct rpc_task *task); +int (*get_srcaddr)(struct rpc_xprt *xprt,char *buf, +size_t buflen); +unsigned short (*get_srcport)(struct rpc_xprt *xprt);int (*buf_alloc)(struct rpc_task *task);void (*buf_free)(struct rpc_task *task);void (*prepare_request)(struct rpc_rqst *req);
include/linux/sunrpc/xprtsock.h +0 -1
@@ -10,7 +10,6 @@int init_socket_xprt (void );void cleanup_socket_xprt (void ); -unsigned short get_srcport (struct rpc_xprt *);#define RPC_MIN_RESVPORT (1U)#define RPC_MAX_RESVPORT (65535U)
net/sunrpc/sysfs.c +26 -24
78 lines not on this page · raw message
net/sunrpc/xprtsock.c +24 -2
@@ -1638,7 +1638,7 @@ static int xs_get_srcport(struct sock_xprt *transport)return port; } -unsigned short get_srcport (struct rpc_xprt *xprt) +static unsigned short xs_sock_srcport (struct rpc_xprt *xprt) { struct sock_xprt *sock = container_of(xprt, struct sock_xprt, xprt);unsigned short ret =0 ;
@@ -1648,7 +1648,25 @@ unsigned short get_srcport(struct rpc_xprt *xprt)mutex_unlock (&sock->recv_mutex);return ret; } -EXPORT_SYMBOL (get_srcport); + +static int xs_sock_srcaddr (struct rpc_xprt *xprt,char *buf,size_t buflen) +{ + struct sock_xprt *sock = container_of(xprt, struct sock_xprt, xprt); +union { +struct sockaddr sa; +struct sockaddr_storage st; + } saddr; +int ret = -ENOTCONN ; + +mutex_lock (&sock->recv_mutex); +if (sock->sock) { + ret =kernel_getsockname (sock->sock, &saddr.sa); +if (ret >=0 ) + ret =snprintf (buf, buflen,"%pISc" , &saddr.sa); + } +mutex_unlock (&sock->recv_mutex); +return ret; +}static unsigned short xs_next_srcport (struct sock_xprt *transport,unsigned short port) {
@@ -2622,6 +2640,8 @@ static const struct rpc_xprt_ops xs_udp_ops = { .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect, + .get_srcaddr = xs_sock_srcaddr, + .get_srcport = xs_sock_srcport, .buf_alloc = rpc_malloc, .buf_free = rpc_free, .send_request = xs_udp_send_request,
@@ -2644,6 +2664,8 @@ static const struct rpc_xprt_ops xs_tcp_ops = { .rpcbind = rpcb_getport_async, .set_port = xs_set_port, .connect = xs_connect, + .get_srcaddr = xs_sock_srcaddr, + .get_srcport = xs_sock_srcport, .buf_alloc = rpc_malloc, .buf_free = rpc_free, .prepare_request = xs_stream_prepare_request,
Signature · 1 line
2.35.1
[email protected]
maintainerPATCH v2 2/2 SUNRPC: Don't return error values in sysfs read of closed files
From: Trond Myklebust <[email protected]>
Instead of returning an error value, which ends up being the return value for the read() system call, it is more elegant to simply return the error as a string value.
Signed-off-by Trond Myklebust <[email protected]>
--- net/sunrpc/sysfs.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
net/sunrpc/sysfs.c +15 -12
@@ -93,10 +93,13 @@ static ssize_t rpc_sysfs_xprt_dstaddr_show(struct kobject *kobj,struct rpc_xprt *xprt =rpc_sysfs_xprt_kobj_get_xprt (kobj);ssize_t ret; -if (!xprt) -return 0 ; +if (!xprt) { + ret =sprintf (buf,"<closed>\n" ); + goto out; + } ret =sprintf (buf,"%s\n" , xprt->address_strings[RPC_DISPLAY_ADDR ]);xprt_put (xprt); +out:return ret +1 ; }
@@ -106,10 +109,10 @@ static ssize_t rpc_sysfs_xprt_srcaddr_show(struct kobject *kobj, {struct rpc_xprt *xprt =rpc_sysfs_xprt_kobj_get_xprt (kobj);size_t buflen =PAGE_SIZE ; -ssize_t ret = -ENOTSOCK ; +ssize_t ret;if (!xprt || !xprt_connected (xprt)) { - ret = -ENOTCONN ; + ret =sprintf (buf,"<closed>\n" ) +1 ; }else if (xprt->ops->get_srcaddr) { ret = xprt->ops->get_srcaddr (xprt, buf, buflen);if (ret >0 ) {
@@ -121,8 +124,10 @@ static ssize_t rpc_sysfs_xprt_srcaddr_show(struct kobject *kobj, buf[ret] ='\0' ; ret++; } - } - } + }else + ret =sprintf (buf,"<closed>\n" ) +1 ; + }else + ret =sprintf (buf,"<not a socket>\n" ) +1 ;xprt_put (xprt);return ret; }
@@ -136,8 +141,8 @@ static ssize_t rpc_sysfs_xprt_info_show(struct kobject *kobj,ssize_t ret;if (!xprt || !xprt_connected (xprt)) { -xprt_put (xprt); -return -ENOTCONN ; + ret =sprintf (buf,"<closed>\n" ); + goto out; }if (xprt->ops->get_srcport)
@@ -155,6 +160,7 @@ static ssize_t rpc_sysfs_xprt_info_show(struct kobject *kobj, xprt->backlog.qlen, xprt->main, srcport,atomic_long_read (&xprt->queuelen), xprt->address_strings[RPC_DISPLAY_PORT]); +out:xprt_put (xprt);return ret +1 ; }
@@ -168,10 +174,7 @@ static ssize_t rpc_sysfs_xprt_state_show(struct kobject *kobj,int locked, connected, connecting, close_wait, bound, binding, closing, congested, cwnd_wait, write_space, offline, remove; -if (!xprt) -return 0 ; - -if (!xprt->state) { +if (!(xprt && xprt->state)) { ret =sprintf (buf,"state=CLOSED\n" ); }else { locked =test_bit (XPRT_LOCKED , &xprt->state);
Signature · 1 line
2.35.1