Skip to content

Commit

Permalink
Revert "kcm: remove any offset before parsing messages"
Browse files Browse the repository at this point in the history
This reverts commit 072222b.

I just read that this causes regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Sep 18, 2018
1 parent 072222b commit 3275b4d
Showing 1 changed file with 1 addition and 25 deletions.
26 changes: 1 addition & 25 deletions net/kcm/kcmsock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 bpf_prog *prog = psock->bpf_prog;
struct sk_buff *clone_skb = NULL;
struct strp_msg *stm;
int rc;

stm = strp_msg(skb);
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;
return (*prog->bpf_func)(skb, prog->insnsi);
}

static int kcm_read_sock_done(struct strparser *strp, int err)
Expand Down

0 comments on commit 3275b4d

Please sign in to comment.