kernel_sendmsg expects contiguous data. Check the skb is linear
before building its kvec. Should be already linearized by the
stack, so this is defensive, but drops the dead block and the
FIXME.
Signed-off-by: Adriano Cordova <redacted>
---
net/bluetooth/bnep/core.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 5a6a49885ab6..497eb1d2d6ee 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -457,13 +457,15 @@ static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
}
send:
+ if (skb_linearize(skb)) {
+ kfree_skb(skb);
+ return -ENOMEM;
+ }
+
iv[il++] = (struct kvec) { skb->data, skb->len };
len += skb->len;
- /* FIXME: linearize skb */
- {
- len = kernel_sendmsg(sock, &s->msg, iv, il, len);
- }
+ len = kernel_sendmsg(sock, &s->msg, iv, il, len);
kfree_skb(skb);
if (len > 0) {--
2.51.0