diff options
| author | Gustavo Padovan | 2012-05-15 18:22:55 +0200 |
|---|---|---|
| committer | Gustavo Padovan | 2012-05-16 21:12:32 +0200 |
| commit | fbe0070092c3968927c63ab56c00b47c6aa3770f (patch) | |
| tree | 0f72c292cd711a6cc91403dea5da56c2f20c00d9 /net/bluetooth/l2cap_core.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (diff) | |
| download | kernel-qcow2-linux-fbe0070092c3968927c63ab56c00b47c6aa3770f.tar.gz kernel-qcow2-linux-fbe0070092c3968927c63ab56c00b47c6aa3770f.tar.xz kernel-qcow2-linux-fbe0070092c3968927c63ab56c00b47c6aa3770f.zip | |
Bluetooth: Fix wrong set of skb fragments
If alloc() fails we let the frags linked list with garbage value (the
err ptr value) in its last element.
Reported-by: Mat Martineau <mathewm@codeaurora.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 3714c9656459..339f8344ee59 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1836,13 +1836,17 @@ static inline int l2cap_skbuff_fromiovec(struct l2cap_chan *chan, /* Continuation fragments (no L2CAP header) */ frag = &skb_shinfo(skb)->frag_list; while (len) { + struct sk_buff *tmp; + count = min_t(unsigned int, conn->mtu, len); - *frag = chan->ops->alloc_skb(chan, count, - msg->msg_flags & MSG_DONTWAIT); + tmp = chan->ops->alloc_skb(chan, count, + msg->msg_flags & MSG_DONTWAIT); + if (IS_ERR(tmp)) + return PTR_ERR(tmp); + + *frag = tmp; - if (IS_ERR(*frag)) - return PTR_ERR(*frag); if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count)) return -EFAULT; |