net/ncsi: Improve HNCDSC AEN handler

[cascardo/linux.git] / net / packet / af_packet.c

diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index b43c401..11db0d6 100644 (file)
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1588,13 +1588,9 @@ static int fanout_set_data_ebpf(struct packet_sock *po, char __user *data,
        if (copy_from_user(&fd, data, len))
                return -EFAULT;
 
-       new = bpf_prog_get(fd);
+       new = bpf_prog_get_type(fd, BPF_PROG_TYPE_SOCKET_FILTER);
        if (IS_ERR(new))
                return PTR_ERR(new);
-       if (new->type != BPF_PROG_TYPE_SOCKET_FILTER) {
-               bpf_prog_put(new);
-               return -EINVAL;
-       }
 
        __fanout_set_data_bpf(po->fanout, new);
        return 0;
@@ -1977,40 +1973,8 @@ static int __packet_rcv_vnet(const struct sk_buff *skb,
 {
        *vnet_hdr = (const struct virtio_net_hdr) { 0 };
 
-       if (skb_is_gso(skb)) {
-               struct skb_shared_info *sinfo = skb_shinfo(skb);
-
-               /* This is a hint as to how much should be linear. */
-               vnet_hdr->hdr_len =
-                       __cpu_to_virtio16(vio_le(), skb_headlen(skb));
-               vnet_hdr->gso_size =
-                       __cpu_to_virtio16(vio_le(), sinfo->gso_size);
-
-               if (sinfo->gso_type & SKB_GSO_TCPV4)
-                       vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV4;
-               else if (sinfo->gso_type & SKB_GSO_TCPV6)
-                       vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_TCPV6;
-               else if (sinfo->gso_type & SKB_GSO_UDP)
-                       vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_UDP;
-               else if (sinfo->gso_type & SKB_GSO_FCOE)
-                       return -EINVAL;
-               else
-                       BUG();
-
-               if (sinfo->gso_type & SKB_GSO_TCP_ECN)
-                       vnet_hdr->gso_type |= VIRTIO_NET_HDR_GSO_ECN;
-       } else
-               vnet_hdr->gso_type = VIRTIO_NET_HDR_GSO_NONE;
-
-       if (skb->ip_summed == CHECKSUM_PARTIAL) {
-               vnet_hdr->flags = VIRTIO_NET_HDR_F_NEEDS_CSUM;
-               vnet_hdr->csum_start = __cpu_to_virtio16(vio_le(),
-                                 skb_checksum_start_offset(skb));
-               vnet_hdr->csum_offset = __cpu_to_virtio16(vio_le(),
-                                                skb->csum_offset);
-       } else if (skb->ip_summed == CHECKSUM_UNNECESSARY) {
-               vnet_hdr->flags = VIRTIO_NET_HDR_F_DATA_VALID;
-       } /* else everything is zero */
+       if (virtio_net_hdr_from_skb(skb, vnet_hdr, vio_le()))
+               BUG();
 
        return 0;
 }
@@ -3988,6 +3952,7 @@ static int packet_notifier(struct notifier_block *this,
                                }
                                if (msg == NETDEV_UNREGISTER) {
                                        packet_cached_dev_reset(po);
+                                       fanout_release(sk);
                                        po->ifindex = -1;
                                        if (po->prot_hook.dev)
                                                dev_put(po->prot_hook.dev);