net: add build-time checks for msg->msg_name size

[deliverable/linux.git] / net / core / sock.c

diff --git a/net/core/sock.c b/net/core/sock.c
index 5393b4b719d71de2e3126664e3dcd5882c0c99d9..0c127dcdf6a8ba9d25d544b02bf798d25fd67f6e 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -925,8 +925,8 @@ set_rcvbuf:
 EXPORT_SYMBOL(sock_setsockopt);
 
 
-void cred_to_ucred(struct pid *pid, const struct cred *cred,
-                  struct ucred *ucred)
+static void cred_to_ucred(struct pid *pid, const struct cred *cred,
+                         struct ucred *ucred)
 {
        ucred->pid = pid_vnr(pid);
        ucred->uid = ucred->gid = -1;
@@ -937,7 +937,6 @@ void cred_to_ucred(struct pid *pid, const struct cred *cred,
                ucred->gid = from_kgid_munged(current_ns, cred->egid);
        }
 }
-EXPORT_SYMBOL_GPL(cred_to_ucred);
 
 int sock_getsockopt(struct socket *sock, int level, int optname,
                    char __user *optval, int __user *optlen)
@@ -1168,6 +1167,10 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
                v.val = sock_flag(sk, SOCK_FILTER_LOCKED);
                break;
 
+       case SO_BPF_EXTENSIONS:
+               v.val = bpf_tell_extensions();
+               break;
+
        case SO_SELECT_ERR_QUEUE:
                v.val = sock_flag(sk, SOCK_SELECT_ERR_QUEUE);
                break;
@@ -1308,19 +1311,7 @@ static void sk_prot_free(struct proto *prot, struct sock *sk)
        module_put(owner);
 }
 
-#if IS_ENABLED(CONFIG_NET_CLS_CGROUP)
-void sock_update_classid(struct sock *sk)
-{
-       u32 classid;
-
-       classid = task_cls_classid(current);
-       if (classid != sk->sk_classid)
-               sk->sk_classid = classid;
-}
-EXPORT_SYMBOL(sock_update_classid);
-#endif
-
-#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
+#if IS_ENABLED(CONFIG_CGROUP_NET_PRIO)
 void sock_update_netprioidx(struct sock *sk)
 {
        if (in_interrupt())
@@ -1665,22 +1656,6 @@ struct sk_buff *sock_wmalloc(struct sock *sk, unsigned long size, int force,
 }
 EXPORT_SYMBOL(sock_wmalloc);
 
-/*
- * Allocate a skb from the socket's receive buffer.
- */
-struct sk_buff *sock_rmalloc(struct sock *sk, unsigned long size, int force,
-                            gfp_t priority)
-{
-       if (force || atomic_read(&sk->sk_rmem_alloc) < sk->sk_rcvbuf) {
-               struct sk_buff *skb = alloc_skb(size, priority);
-               if (skb) {
-                       skb_set_owner_r(skb, sk);
-                       return skb;
-               }
-       }
-       return NULL;
-}
-
 /*
  * Allocate a memory block from the socket's option memory buffer.
  */
@@ -1865,9 +1840,7 @@ bool skb_page_frag_refill(unsigned int sz, struct page_frag *pfrag, gfp_t prio)
                put_page(pfrag->page);
        }
 
-       /* We restrict high order allocations to users that can afford to wait */
-       order = (prio & __GFP_WAIT) ? SKB_FRAG_PAGE_ORDER : 0;
-
+       order = SKB_FRAG_PAGE_ORDER;
        do {
                gfp_t gfp = prio;