diff options
| -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; | 
