lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mISDN: Fix skb leak in error cases

Browse Source 
If the channel receive function returns an error the skb must be freed.

Signed-off-by: Karsten Keil <keil@b1-systems.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Karsten Keil
2009-05-22 11:04:52 +00:00
committed by David S. Miller
parent d796509a57
commit 5df3b8bcc7
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/isdn/mISDN/socket.c
View File

@@ -209,7 +209,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) { if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
err = -EFAULT; err = -EFAULT;
goto drop; goto done;
} }
memcpy(mISDN_HEAD_P(skb), skb->data, MISDN_HEADER_LEN); memcpy(mISDN_HEAD_P(skb), skb->data, MISDN_HEADER_LEN);
@@ -230,19 +230,21 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
__func__, mISDN_HEAD_ID(skb)); __func__, mISDN_HEAD_ID(skb));
err = -ENODEV; err = -ENODEV;
if (!_pms(sk)->ch.peer || if (!_pms(sk)->ch.peer)
(err = _pms(sk)->ch.recv(_pms(sk)->ch.peer, skb))) goto done;
goto drop; err = _pms(sk)->ch.recv(_pms(sk)->ch.peer, skb);
if (err)
goto done;
else {
skb = NULL;
err = len; err = len;
}
done: done:
if (skb)
kfree_skb(skb);
release_sock(sk); release_sock(sk);
return err; return err;
drop:
kfree_skb(skb);
goto done;
} }
static int static int