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 85ad6f0d389857da07347ddb18d0f9675936f0c4..0c127dcdf6a8ba9d25d544b02bf798d25fd67f6e 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1167,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;
@@ -1836,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;