diff options
| author | Jason Wang <jasowang@redhat.com> | 2016-08-11 18:15:56 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-11 09:55:51 -0700 |
| commit | 104a493390940e85fb7c840a9fd5214aba5cb3bd (patch) | |
| tree | d3852c2c9aafedd2debb4ea48f32c9c65fe034a6 | |
| parent | 4b5b9ba553f9aa5f484ab972fc9b58061885ceca (diff) | |
| download | lwn-104a493390940e85fb7c840a9fd5214aba5cb3bd.tar.gz lwn-104a493390940e85fb7c840a9fd5214aba5cb3bd.zip | |
macvtap: fix use after free for skb_array during release
We've clean skb_array in macvtap_put_queue() but still try to pop from
it during macvtap_sock_destruct(). Fix this use after free by moving
the skb array cleanup to macvtap_sock_destruct() instead.
Fixes: 362899b8725b ("macvtap: switch to use skb array")
Reported-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/macvtap.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index a38c0dac514b..070e3290aa6e 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -275,7 +275,6 @@ static void macvtap_put_queue(struct macvtap_queue *q) rtnl_unlock(); synchronize_rcu(); - skb_array_cleanup(&q->skb_array); sock_put(&q->sk); } @@ -533,10 +532,8 @@ static void macvtap_sock_write_space(struct sock *sk) static void macvtap_sock_destruct(struct sock *sk) { struct macvtap_queue *q = container_of(sk, struct macvtap_queue, sk); - struct sk_buff *skb; - while ((skb = skb_array_consume(&q->skb_array)) != NULL) - kfree_skb(skb); + skb_array_cleanup(&q->skb_array); } static int macvtap_open(struct inode *inode, struct file *file) |