diff options
author | David S. Miller <davem@davemloft.net> | 2018-09-17 21:43:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-09-17 21:43:42 -0400 |
commit | 3275b4df3c39f97ee3fe982c9bafd6f3b7ff0dfe (patch) | |
tree | 59434b140311a02899c747f90404aacd640bf0cb | |
parent | 072222b488bc55cce92ff246bdc10115fd57d3ab (diff) |
Revert "kcm: remove any offset before parsing messages"
This reverts commit 072222b488bc55cce92ff246bdc10115fd57d3ab.
I just read that this causes regressions.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/kcm/kcmsock.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 36c438b95955..571d824e4e24 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c | |||
@@ -381,32 +381,8 @@ static int kcm_parse_func_strparser(struct strparser *strp, struct sk_buff *skb) | |||
381 | { | 381 | { |
382 | struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp); | 382 | struct kcm_psock *psock = container_of(strp, struct kcm_psock, strp); |
383 | struct bpf_prog *prog = psock->bpf_prog; | 383 | struct bpf_prog *prog = psock->bpf_prog; |
384 | struct sk_buff *clone_skb = NULL; | ||
385 | struct strp_msg *stm; | ||
386 | int rc; | ||
387 | |||
388 | stm = strp_msg(skb); | ||
389 | if (stm->offset) { | ||
390 | skb = clone_skb = skb_clone(skb, GFP_ATOMIC); | ||
391 | if (!clone_skb) | ||
392 | return -ENOMEM; | ||
393 | |||
394 | if (!pskb_pull(clone_skb, stm->offset)) { | ||
395 | rc = -ENOMEM; | ||
396 | goto out; | ||
397 | } | ||
398 | |||
399 | /* reset cloned skb's offset for bpf programs using it */ | ||
400 | stm = strp_msg(clone_skb); | ||
401 | stm->offset = 0; | ||
402 | } | ||
403 | |||
404 | rc = (*prog->bpf_func)(skb, prog->insnsi); | ||
405 | out: | ||
406 | if (clone_skb) | ||
407 | kfree_skb(clone_skb); | ||
408 | 384 | ||
409 | return rc; | 385 | return (*prog->bpf_func)(skb, prog->insnsi); |
410 | } | 386 | } |
411 | 387 | ||
412 | static int kcm_read_sock_done(struct strparser *strp, int err) | 388 | static int kcm_read_sock_done(struct strparser *strp, int err) |