summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/xprtsock.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-11 16:15:36 -0400
committerDavid S. Miller <davem@davemloft.net>2014-04-11 16:15:36 -0400
commit676d23690fb62b5d51ba5d659935e9f7d9da9f8e (patch)
treef6fbceee43e05c724868153ca37b702fb5e43b8c /net/sunrpc/xprtsock.c
parentad20d5f673898578f9d8a156d7a4c921f5ca4584 (diff)
net: Fix use after free by removing length arg from sk_data_ready callbacks.
Several spots in the kernel perform a sequence like: skb_queue_tail(&sk->s_receive_queue, skb); sk->sk_data_ready(sk, skb->len); But at the moment we place the SKB onto the socket receive queue it can be consumed and freed up. So this skb->len access is potentially to freed up memory. Furthermore, the skb->len can be modified by the consumer so it is possible that the value isn't accurate. And finally, no actual implementation of this callback actually uses the length argument. And since nobody actually cared about it's value, lots of call sites pass arbitrary values in such as '0' and even '1'. So just remove the length argument from the callback, that way there is no confusion whatsoever and all of these use-after-free cases get fixed as a side effect. Based upon a patch by Eric Dumazet and his suggestion to audit this issue tree-wide. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sunrpc/xprtsock.c')
-rw-r--r--net/sunrpc/xprtsock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index 966763d735e9..96458d434324 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -254,7 +254,7 @@ struct sock_xprt {
254 /* 254 /*
255 * Saved socket callback addresses 255 * Saved socket callback addresses
256 */ 256 */
257 void (*old_data_ready)(struct sock *, int); 257 void (*old_data_ready)(struct sock *);
258 void (*old_state_change)(struct sock *); 258 void (*old_state_change)(struct sock *);
259 void (*old_write_space)(struct sock *); 259 void (*old_write_space)(struct sock *);
260 void (*old_error_report)(struct sock *); 260 void (*old_error_report)(struct sock *);
@@ -946,7 +946,7 @@ static int xs_local_copy_to_xdr(struct xdr_buf *xdr, struct sk_buff *skb)
946 * 946 *
947 * Currently this assumes we can read the whole reply in a single gulp. 947 * Currently this assumes we can read the whole reply in a single gulp.
948 */ 948 */
949static void xs_local_data_ready(struct sock *sk, int len) 949static void xs_local_data_ready(struct sock *sk)
950{ 950{
951 struct rpc_task *task; 951 struct rpc_task *task;
952 struct rpc_xprt *xprt; 952 struct rpc_xprt *xprt;
@@ -1009,7 +1009,7 @@ static void xs_local_data_ready(struct sock *sk, int len)
1009 * @len: how much data to read 1009 * @len: how much data to read
1010 * 1010 *
1011 */ 1011 */
1012static void xs_udp_data_ready(struct sock *sk, int len) 1012static void xs_udp_data_ready(struct sock *sk)
1013{ 1013{
1014 struct rpc_task *task; 1014 struct rpc_task *task;
1015 struct rpc_xprt *xprt; 1015 struct rpc_xprt *xprt;
@@ -1432,7 +1432,7 @@ static int xs_tcp_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, uns
1432 * @bytes: how much data to read 1432 * @bytes: how much data to read
1433 * 1433 *
1434 */ 1434 */
1435static void xs_tcp_data_ready(struct sock *sk, int bytes) 1435static void xs_tcp_data_ready(struct sock *sk)
1436{ 1436{
1437 struct rpc_xprt *xprt; 1437 struct rpc_xprt *xprt;
1438 read_descriptor_t rd_desc; 1438 read_descriptor_t rd_desc;