Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3275b4df authored by David S. Miller's avatar David S. Miller
Browse files

Revert "kcm: remove any offset before parsing messages" 



This reverts commit 072222b4.

I just read that this causes regressions.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 072222b4

net/kcm/kcmsock.c

+1 −25
Original line number Diff line number Diff line
@@ -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)