rose: limit sk_filter trim to payload

[pandora-kernel.git] / net / core / filter.c

diff --git a/net/core/filter.c b/net/core/filter.c
index 9c88080..6266772 100644 (file)
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -64,9 +64,10 @@ static inline void *load_pointer(const struct sk_buff *skb, int k,
 }
 
 /**
 }
 
 /**

- *     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
  *     @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
  *
  * 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


@@ -75,7 +76,7 @@ static inline void *load_pointer(const struct sk_buff *skb, int k,
  * 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;
        struct sk_filter *filter;
 {
        int err;
        struct sk_filter *filter;


@@ -88,14 +89,13 @@ int sk_filter(struct sock *sk, struct sk_buff *skb)
        filter = rcu_dereference(sk->sk_filter);
        if (filter) {
                unsigned int pkt_len = SK_RUN_FILTER(filter, skb);
        filter = rcu_dereference(sk->sk_filter);
        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;
 }
        }
        rcu_read_unlock();
 
        return err;
 }

-EXPORT_SYMBOL(sk_filter);
+EXPORT_SYMBOL(sk_filter_trim_cap);

 
 /**
  *     sk_run_filter - run a filter on a socket
 
 /**
  *     sk_run_filter - run a filter on a socket