Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Just several instances of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 13 insertions, 8 deletions

diff --git a/net/core/filter.c b/net/core/filter.c
index 6c627bc4be6e..0b521353008d 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -53,9 +53,10 @@
 #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
  *      @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
  * 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.
  *
  */
-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;
@@ -85,14 +86,13 @@ int sk_filter(struct sock *sk, struct sk_buff *skb)
         filter = rcu_dereference(sk->sk_filter);
         if (filter) {
                 unsigned int pkt_len = bpf_prog_run_save_cb(filter->prog, 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)
 {
diff --git a/net/core/sock.c b/net/core/sock.c
index 08bf97eceeb3..25dab8b60223 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -452,11 +452,12 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 }
 EXPORT_SYMBOL(sock_queue_rcv_skb);
 
-int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
+int __sk_receive_skb(struct sock *sk, struct sk_buff *skb,
+                     const int nested, unsigned int trim_cap)
 {
         int rc = NET_RX_SUCCESS;
 
-        if (sk_filter(sk, skb))
+        if (sk_filter_trim_cap(sk, skb, trim_cap))
                 goto discard_and_relse;
 
         skb->dev = NULL;
@@ -492,7 +493,7 @@ discard_and_relse:
         kfree_skb(skb);
         goto out;
 }
-EXPORT_SYMBOL(sk_receive_skb);
+EXPORT_SYMBOL(__sk_receive_skb);
 
 struct dst_entry *__sk_dst_check(struct sock *sk, u32 cookie)
 {
@@ -1938,6 +1939,10 @@ int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,
                 sockc->tsflags &= ~SOF_TIMESTAMPING_TX_RECORD_MASK;
                 sockc->tsflags |= tsflags;
                 break;
+        /* SCM_RIGHTS and SCM_CREDENTIALS are semantically in SOL_UNIX. */
+        case SCM_RIGHTS:
+        case SCM_CREDENTIALS:
+                break;
         default:
                 return -EINVAL;
         }