hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: caif: use skb helpers instead of open-coding them

Browse Source 
Use existing skb_put_data() and skb_trim() instead of open-coding them,
with the skb_put_data() first so that logically, `skb` still contains the
data to be copied in its data..tail area when skb_put_data() reads it.
This change on its own is a cleanup, and it is also necessary for potential
future integration of skbuffs with things like KASAN.

Signed-off-by: Jann Horn <jannh@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jann Horn 2019-02-14 22:35:47 +01:00 committed by David S. Miller
parent 6a79507cfe
commit 1eb00162f8
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/caif/cfpkt_skbuff.c
View File

@ -319,16 +319,12 @@ struct cfpkt *cfpkt_append(struct cfpkt *dstpkt,
if (tmppkt == NULL) if (tmppkt == NULL)
return NULL; return NULL;
tmp = pkt_to_skb(tmppkt); tmp = pkt_to_skb(tmppkt);
skb_set_tail_pointer(tmp, dstlen); skb_put_data(tmp, dst->data, dstlen);
tmp->len = dstlen;
memcpy(tmp->data, dst->data, dstlen);
cfpkt_destroy(dstpkt); cfpkt_destroy(dstpkt);
dst = tmp; dst = tmp;
} }
memcpy(skb_tail_pointer(dst), add->data, skb_headlen(add)); skb_put_data(dst, add->data, skb_headlen(add));
cfpkt_destroy(addpkt); cfpkt_destroy(addpkt);
dst->tail += addlen;
dst->len += addlen;
return skb_to_pkt(dst); return skb_to_pkt(dst);
} }
@ -359,13 +355,11 @@ struct cfpkt *cfpkt_split(struct cfpkt *pkt, u16 pos)
if (skb2 == NULL) if (skb2 == NULL)
return NULL; return NULL;
/* Reduce the length of the original packet */ skb_put_data(skb2, split, len2nd);
skb_set_tail_pointer(skb, pos);
skb->len = pos; /* Reduce the length of the original packet */
skb_trim(skb, pos);
memcpy(skb2->data, split, len2nd);
skb2->tail += len2nd;
skb2->len += len2nd;
skb2->priority = skb->priority; skb2->priority = skb->priority;
return skb_to_pkt(skb2); return skb_to_pkt(skb2);
} }