diff options
| author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-12-14 23:16:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-14 23:16:58 -0800 |
| commit | ebad5c0984e06f4036d2eb2741b9afce736b8a06 (patch) | |
| tree | 7d9af4a5db85b952fbd5b744055f530c4f977921 /net/can | |
| parent | d8eb93078cedbbf4b7e18e1d7054171c7b70b442 (diff) | |
| download | linux-3.10-ebad5c0984e06f4036d2eb2741b9afce736b8a06.tar.gz linux-3.10-ebad5c0984e06f4036d2eb2741b9afce736b8a06.tar.bz2 linux-3.10-ebad5c0984e06f4036d2eb2741b9afce736b8a06.zip | |
can: merge error paths
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/can')
| -rw-r--r-- | net/can/raw.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 6e0663faaf9..27aab63df46 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -641,17 +641,12 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, skb = sock_alloc_send_skb(sk, size, msg->msg_flags & MSG_DONTWAIT, &err); - if (!skb) { - dev_put(dev); - return err; - } + if (!skb) + goto put_dev; err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); - if (err < 0) { - kfree_skb(skb); - dev_put(dev); - return err; - } + if (err < 0) + goto free_skb; skb->dev = dev; skb->sk = sk; @@ -660,9 +655,16 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, dev_put(dev); if (err) - return err; + goto send_failed; return size; + +free_skb: + kfree_skb(skb); +put_dev: + dev_put(dev); +send_failed: + return err; } static int raw_recvmsg(struct kiocb *iocb, struct socket *sock, |