mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rose: limit sk_filter trim to payload

Browse source 
Sockets can have a filter program attached that drops or trims
incoming packets based on the filter program return value.

Rose requires data packets to have at least ROSE_MIN_LEN bytes. It
verifies this on arrival in rose_route_frame and unconditionally pulls
the bytes in rose_recvmsg. The filter can trim packets to below this
value in-between, causing pull to fail, leaving the partial header at
the time of skb_copy_datagram_msg.

Place a lower bound on the size to which sk_filter may trim packets
by introducing sk_filter_trim_cap and call this for rose packets.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Willem de Bruijn 2016-07-12 18:18:56 -04:00 committed by David S. Miller
parent 22cb99fb76
commit f4979fcea7
3 changed files with 12 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
include/linux/filter.h
View file

@ -467,7 +467,11 @@ static inline void bpf_prog_unlock_ro(struct bpf_prog *fp)
} }
#endif /* CONFIG_DEBUG_SET_MODULE_RONX */ #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);
}
struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err); struct bpf_prog *bpf_prog_select_runtime(struct bpf_prog *fp, int *err);
void bpf_prog_free(struct bpf_prog *fp); void bpf_prog_free(struct bpf_prog *fp);

10
net/core/filter.c
View file

@ -53,9 +53,10 @@
#include <net/sock_reuseport.h> #include <net/sock_reuseport.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 * @sk: sock associated with &sk_buff
* @skb: buffer to filter * @skb: buffer to filter
* @cap: limit on how short the eBPF program may trim the packet
* *
* Run the eBPF program and then cut skb->data to correct size returned by * Run the eBPF program and then cut skb->data to correct size returned by
* the program. If pkt_len is 0 we toss packet. If skb->len is smaller * the program. If pkt_len is 0 we toss packet. If skb->len is smaller
@ -64,7 +65,7 @@
* be accepted or -EPERM if the packet should be tossed. * 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; int err;
struct sk_filter *filter; struct sk_filter *filter;
@ -85,14 +86,13 @@ int sk_filter(struct sock *sk, struct sk_buff *skb)
filter = rcu_dereference(sk->sk_filter); filter = rcu_dereference(sk->sk_filter);
if (filter) { if (filter) {
unsigned int pkt_len = bpf_prog_run_save_cb(filter->prog, skb); unsigned int pkt_len = bpf_prog_run_save_cb(filter->prog, skb);
err = pkt_len ? pskb_trim(skb, max(cap, pkt_len)) : -EPERM;
err = pkt_len ? pskb_trim(skb, pkt_len) : -EPERM;
} }
rcu_read_unlock(); rcu_read_unlock();
return err; 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) static u64 __skb_get_pay_offset(u64 ctx, u64 a, u64 x, u64 r4, u64 r5)
{ {

3
net/rose/rose_in.c
View file

@ -164,7 +164,8 @@ static int rose_state3_machine(struct sock *sk, struct sk_buff *skb, int framety
rose_frames_acked(sk, nr); rose_frames_acked(sk, nr);
if (ns == rose->vr) { if (ns == rose->vr) {
rose_start_idletimer(sk); 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; rose->vr = (rose->vr + 1) % ROSE_MODULUS;
queued = 1; queued = 1;
} else { } else {