aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/bluetooth/l2cap_core.c12
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,
1836 /* Continuation fragments (no L2CAP header) */ 1836 /* Continuation fragments (no L2CAP header) */
1837 frag = &skb_shinfo(skb)->frag_list; 1837 frag = &skb_shinfo(skb)->frag_list;
1838 while (len) { 1838 while (len) {
1839 struct sk_buff *tmp;
1840
1839 count = min_t(unsigned int, conn->mtu, len); 1841 count = min_t(unsigned int, conn->mtu, len);
1840 1842
1841 *frag = chan->ops->alloc_skb(chan, count, 1843 tmp = chan->ops->alloc_skb(chan, count,
1842 msg->msg_flags & MSG_DONTWAIT); 1844 msg->msg_flags & MSG_DONTWAIT);
1845 if (IS_ERR(tmp))
1846 return PTR_ERR(tmp);
1847
1848 *frag = tmp;
1843 1849
1844 if (IS_ERR(*frag))
1845 return PTR_ERR(*frag);
1846 if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count)) 1850 if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count))
1847 return -EFAULT; 1851 return -EFAULT;
1848 1852