Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "kcm: remove any offset before parsing messages"

Browse source 
This reverts commit 072222b488.

I just read that this causes regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2018-09-17 18:43:42 -07:00
parent 072222b488
commit 3275b4df3c
1 changed files with 1 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
net/kcm/kcmsock.c
View file

@ -381,32 +381,8 @@ static int kcm_parse_func_strparser(struct strparser *strp, struct sk_buff *skb)
{ {
struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp); struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp);
struct bpf_prog *prog = psock->bpf_prog; struct bpf_prog *prog = psock->bpf_prog;
struct sk_buff *clone_skb = NULL;
struct strp_msg *stm;
int rc;
stm = strp_msg(skb); return (*prog->bpf_func)(skb, prog->insnsi);
if (stm->offset) {
skb = clone_skb = skb_clone(skb, GFP_ATOMIC);
if (!clone_skb)
return -ENOMEM;
if (!pskb_pull(clone_skb, stm->offset)) {
rc = -ENOMEM;
goto out;
}
/* reset cloned skb's offset for bpf programs using it */
stm = strp_msg(clone_skb);
stm->offset = 0;
}
rc = (*prog->bpf_func)(skb, prog->insnsi);
out:
if (clone_skb)
kfree_skb(clone_skb);
return rc;
} }
static int kcm_read_sock_done(struct strparser *strp, int err) static int kcm_read_sock_done(struct strparser *strp, int err)