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

Commit cec81c86 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "rose: limit sk_filter trim to payload"

parents f3082ab7 94638198

include/linux/filter.h

+5 −1
Original line number Diff line number Diff line
@@ -358,7 +358,11 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp) 
}

#endif /* CONFIG_DEBUG_SET_MODULE_RONX */



int sk_filter(struct sock *sk, struct sk_buff *skb);

int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap);

static inline int sk_filter(struct sock *sk, struct sk_buff *skb)

{

	return sk_filter_trim_cap(sk, skb, 1);

}



void bpf_prog_select_runtime(struct bpf_prog *fp);

void bpf_prog_free(struct bpf_prog *fp);

net/core/filter.c

+5 −4
Original line number Diff line number Diff line
@@ -46,9 +46,10 @@ 
#include <linux/if_vlan.h>



/**

 *	sk_filter - run a packet through a socket filter

 *	sk_filter_trim_cap - run a packet through a socket filter

 *	@sk: sock associated with &sk_buff

 *	@skb: buffer to filter

 *	@cap: limit on how short the eBPF program may trim the packet

 *

 * Run the filter code and then cut skb->data to correct size returned by

 * SK_RUN_FILTER. If pkt_len is 0 we toss packet. If skb->len is smaller
@@ -57,7 +58,7 @@ 
 * be accepted or -EPERM if the packet should be tossed.

 *

 */

int sk_filter(struct sock *sk, struct sk_buff *skb)

int sk_filter_trim_cap(struct sock *sk, struct sk_buff *skb, unsigned int cap)

{

	int err;

	struct sk_filter *filter;
@@ -79,13 +80,13 @@ int sk_filter(struct sock *sk, struct sk_buff *skb) 
	if (filter) {

		unsigned int pkt_len = SK_RUN_FILTER(filter, skb);



		err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;

		err = pkt_len ? pskb_trim(skb, max(cap, pkt_len)) : -EPERM;

	}

	rcu_read_unlock();



	return err;

}

EXPORT_SYMBOL(sk_filter);

EXPORT_SYMBOL(sk_filter_trim_cap);



static u64 __skb_get_pay_offset(u64 ctx, u64 a, u64 x, u64 r4, u64 r5)

{

net/rose/rose_in.c

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety 
		rose_frames_acked(sk, nr);

		if (ns == rose->vr) {

			rose_start_idletimer(sk);

			if (sock_queue_rcv_skb(sk, skb) == 0) {

			if (sk_filter_trim_cap(sk, skb, ROSE_MIN_LEN) == 0 &&

			    sock_queue_rcv_skb(sk, skb) == 0) {

				rose->vr = (rose->vr + 1) % ROSE_MODULUS;

				queued = 1;

			} else {