diff options
author | David S. Miller <davem@davemloft.net> | 2014-04-11 16:15:36 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-11 16:15:36 -0400 |
commit | 676d23690fb62b5d51ba5d659935e9f7d9da9f8e (patch) | |
tree | f6fbceee43e05c724868153ca37b702fb5e43b8c /fs/ncpfs | |
parent | ad20d5f673898578f9d8a156d7a4c921f5ca4584 (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 'fs/ncpfs')
-rw-r--r-- | fs/ncpfs/ncp_fs_sb.h | 4 | ||||
-rw-r--r-- | fs/ncpfs/sock.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/ncpfs/ncp_fs_sb.h b/fs/ncpfs/ncp_fs_sb.h index b81e97adc5a9..fbb08818775e 100644 --- a/fs/ncpfs/ncp_fs_sb.h +++ b/fs/ncpfs/ncp_fs_sb.h | |||
@@ -111,7 +111,7 @@ struct ncp_server { | |||
111 | 111 | ||
112 | spinlock_t requests_lock; /* Lock accesses to tx.requests, tx.creq and rcv.creq when STREAM mode */ | 112 | spinlock_t requests_lock; /* Lock accesses to tx.requests, tx.creq and rcv.creq when STREAM mode */ |
113 | 113 | ||
114 | void (*data_ready)(struct sock* sk, int len); | 114 | void (*data_ready)(struct sock* sk); |
115 | void (*error_report)(struct sock* sk); | 115 | void (*error_report)(struct sock* sk); |
116 | void (*write_space)(struct sock* sk); /* STREAM mode only */ | 116 | void (*write_space)(struct sock* sk); /* STREAM mode only */ |
117 | struct { | 117 | struct { |
@@ -153,7 +153,7 @@ extern void ncp_tcp_tx_proc(struct work_struct *work); | |||
153 | extern void ncpdgram_rcv_proc(struct work_struct *work); | 153 | extern void ncpdgram_rcv_proc(struct work_struct *work); |
154 | extern void ncpdgram_timeout_proc(struct work_struct *work); | 154 | extern void ncpdgram_timeout_proc(struct work_struct *work); |
155 | extern void ncpdgram_timeout_call(unsigned long server); | 155 | extern void ncpdgram_timeout_call(unsigned long server); |
156 | extern void ncp_tcp_data_ready(struct sock* sk, int len); | 156 | extern void ncp_tcp_data_ready(struct sock* sk); |
157 | extern void ncp_tcp_write_space(struct sock* sk); | 157 | extern void ncp_tcp_write_space(struct sock* sk); |
158 | extern void ncp_tcp_error_report(struct sock* sk); | 158 | extern void ncp_tcp_error_report(struct sock* sk); |
159 | 159 | ||
diff --git a/fs/ncpfs/sock.c b/fs/ncpfs/sock.c index 3a1587222c8a..652da0db932c 100644 --- a/fs/ncpfs/sock.c +++ b/fs/ncpfs/sock.c | |||
@@ -96,11 +96,11 @@ static void ncp_req_put(struct ncp_request_reply *req) | |||
96 | kfree(req); | 96 | kfree(req); |
97 | } | 97 | } |
98 | 98 | ||
99 | void ncp_tcp_data_ready(struct sock *sk, int len) | 99 | void ncp_tcp_data_ready(struct sock *sk) |
100 | { | 100 | { |
101 | struct ncp_server *server = sk->sk_user_data; | 101 | struct ncp_server *server = sk->sk_user_data; |
102 | 102 | ||
103 | server->data_ready(sk, len); | 103 | server->data_ready(sk); |
104 | schedule_work(&server->rcv.tq); | 104 | schedule_work(&server->rcv.tq); |
105 | } | 105 | } |
106 | 106 | ||