Skip to content

L
linux
Commit 40d4e3df authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files
Options

af_packet: style cleanups 

Some style cleanups to match current code practices.
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c9a73cdb
Show whitespace changes
Inline Side-by-side
Showing with 122 additions and 124 deletions
net/packet/af_packet.c
View file @ 40d4e3df
...@@ -137,8 +137,7 @@ dev->hard_header == NULL (ll header is added by device, we cannot control it) ...@@ -137,8 +137,7 @@ dev->hard_header == NULL (ll header is added by device, we cannot control it)
/* Private packet socket structures. */ /* Private packet socket structures. */
struct packet_mclist struct packet_mclist {
{
struct packet_mclist *next; struct packet_mclist *next;
int ifindex; int ifindex;
int count; int count;
...@@ -149,8 +148,7 @@ struct packet_mclist ...@@ -149,8 +148,7 @@ struct packet_mclist
/* identical to struct packet_mreq except it has /* identical to struct packet_mreq except it has
* a longer address field. * a longer address field.
*/ */
struct packet_mreq_max struct packet_mreq_max {
{
int mr_ifindex; int mr_ifindex;
unsigned short mr_type; unsigned short mr_type;
unsigned short mr_alen; unsigned short mr_alen;
...@@ -162,7 +160,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, ...@@ -162,7 +160,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req,
int closing, int tx_ring); int closing, int tx_ring);
struct packet_ring_buffer { struct packet_ring_buffer {
char * *pg_vec; char **pg_vec;
unsigned int head; unsigned int head;
unsigned int frames_per_block; unsigned int frames_per_block;
unsigned int frame_size; unsigned int frame_size;
...@@ -239,7 +237,7 @@ static void __packet_set_status(struct packet_sock *po, void *frame, int status) ...@@ -239,7 +237,7 @@ static void __packet_set_status(struct packet_sock *po, void *frame, int status)
flush_dcache_page(virt_to_page(&h.h2->tp_status)); flush_dcache_page(virt_to_page(&h.h2->tp_status));
break; break;
default: default:
printk(KERN_ERR "TPACKET version not supported\n"); pr_err("TPACKET version not supported\n");
BUG(); BUG();
} }
...@@ -265,7 +263,7 @@ static int __packet_get_status(struct packet_sock *po, void *frame) ...@@ -265,7 +263,7 @@ static int __packet_get_status(struct packet_sock *po, void *frame)
flush_dcache_page(virt_to_page(&h.h2->tp_status)); flush_dcache_page(virt_to_page(&h.h2->tp_status));
return h.h2->tp_status; return h.h2->tp_status;
default: default:
printk(KERN_ERR "TPACKET version not supported\n"); pr_err("TPACKET version not supported\n");
BUG(); BUG();
return 0; return 0;
} }
...@@ -327,7 +325,7 @@ static void packet_sock_destruct(struct sock *sk) ...@@ -327,7 +325,7 @@ static void packet_sock_destruct(struct sock *sk)
WARN_ON(atomic_read(&sk->sk_wmem_alloc)); WARN_ON(atomic_read(&sk->sk_wmem_alloc));
if (!sock_flag(sk, SOCK_DEAD)) { if (!sock_flag(sk, SOCK_DEAD)) {
printk("Attempt to release alive packet socket: %p\n", sk); pr_err("Attempt to release alive packet socket: %p\n", sk);
return; return;
} }
...@@ -339,7 +337,8 @@ static const struct proto_ops packet_ops; ...@@ -339,7 +337,8 @@ static const struct proto_ops packet_ops;
static const struct proto_ops packet_ops_spkt; static const struct proto_ops packet_ops_spkt;
static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{ {
struct sock *sk; struct sock *sk;
struct sockaddr_pkt *spkt; struct sockaddr_pkt *spkt;
...@@ -368,7 +367,8 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct ...@@ -368,7 +367,8 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct
if (dev_net(dev) != sock_net(sk)) if (dev_net(dev) != sock_net(sk))
goto out; goto out;
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) skb = skb_share_check(skb, GFP_ATOMIC);
if (skb == NULL)
goto oom; goto oom;
/* drop any routing info */ /* drop any routing info */
...@@ -394,7 +394,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct ...@@ -394,7 +394,7 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, struct
* to prevent sockets using all the memory up. * to prevent sockets using all the memory up.
*/ */
if (sock_queue_rcv_skb(sk,skb) == 0) if (sock_queue_rcv_skb(sk, skb) == 0)
return 0; return 0;
out: out:
...@@ -413,25 +413,23 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, ...@@ -413,25 +413,23 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
struct msghdr *msg, size_t len) struct msghdr *msg, size_t len)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct sockaddr_pkt *saddr=(struct sockaddr_pkt *)msg->msg_name; struct sockaddr_pkt *saddr = (struct sockaddr_pkt *)msg->msg_name;
struct sk_buff *skb; struct sk_buff *skb;
struct net_device *dev; struct net_device *dev;
__be16 proto=0; __be16 proto = 0;
int err; int err;
/* /*
* Get and verify the address. * Get and verify the address.
*/ */
if (saddr) if (saddr) {
{
if (msg->msg_namelen < sizeof(struct sockaddr)) if (msg->msg_namelen < sizeof(struct sockaddr))
return(-EINVAL); return -EINVAL;
if (msg->msg_namelen==sizeof(struct sockaddr_pkt)) if (msg->msg_namelen == sizeof(struct sockaddr_pkt))
proto=saddr->spkt_protocol; proto = saddr->spkt_protocol;
} } else
else return -ENOTCONN; /* SOCK_PACKET must be sent giving an address */
return(-ENOTCONN); /* SOCK_PACKET must be sent giving an address */
/* /*
* Find the device first to size check it * Find the device first to size check it
...@@ -460,9 +458,9 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, ...@@ -460,9 +458,9 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
skb = sock_wmalloc(sk, len + LL_RESERVED_SPACE(dev), 0, GFP_KERNEL); skb = sock_wmalloc(sk, len + LL_RESERVED_SPACE(dev), 0, GFP_KERNEL);
/* /*
* If the write buffer is full, then tough. At this level the user gets to * If the write buffer is full, then tough. At this level the user
* deal with the problem - do your own algorithmic backoffs. That's far * gets to deal with the problem - do your own algorithmic backoffs.
* more flexible. * That's far more flexible.
*/ */
if (skb == NULL) if (skb == NULL)
...@@ -488,7 +486,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, ...@@ -488,7 +486,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
} }
/* Returns -EFAULT on error */ /* Returns -EFAULT on error */
err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len); err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
skb->protocol = proto; skb->protocol = proto;
skb->dev = dev; skb->dev = dev;
skb->priority = sk->sk_priority; skb->priority = sk->sk_priority;
...@@ -501,7 +499,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, ...@@ -501,7 +499,7 @@ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock,
dev_queue_xmit(skb); dev_queue_xmit(skb);
dev_put(dev); dev_put(dev);
return(len); return len;
out_free: out_free:
kfree_skb(skb); kfree_skb(skb);
...@@ -537,12 +535,13 @@ static inline unsigned int run_filter(struct sk_buff *skb, struct sock *sk, ...@@ -537,12 +535,13 @@ static inline unsigned int run_filter(struct sk_buff *skb, struct sock *sk,
we will not harm anyone. we will not harm anyone.
*/ */
static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) static int packet_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{ {
struct sock *sk; struct sock *sk;
struct sockaddr_ll *sll; struct sockaddr_ll *sll;
struct packet_sock *po; struct packet_sock *po;
u8 * skb_head = skb->data; u8 *skb_head = skb->data;
int skb_len = skb->len; int skb_len = skb->len;
unsigned int snaplen, res; unsigned int snaplen, res;
...@@ -648,7 +647,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet ...@@ -648,7 +647,8 @@ static int packet_rcv(struct sk_buff *skb, struct net_device *dev, struct packet
} }
#ifdef CONFIG_PACKET_MMAP #ifdef CONFIG_PACKET_MMAP
static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{ {
struct sock *sk; struct sock *sk;
struct packet_sock *po; struct packet_sock *po;
...@@ -658,7 +658,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe ...@@ -658,7 +658,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
struct tpacket2_hdr *h2; struct tpacket2_hdr *h2;
void *raw; void *raw;
} h; } h;
u8 * skb_head = skb->data; u8 *skb_head = skb->data;
int skb_len = skb->len; int skb_len = skb->len;
unsigned int snaplen, res; unsigned int snaplen, res;
unsigned long status = TP_STATUS_LOSING|TP_STATUS_USER; unsigned long status = TP_STATUS_LOSING|TP_STATUS_USER;
...@@ -821,7 +821,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe ...@@ -821,7 +821,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, struct packe
static void tpacket_destruct_skb(struct sk_buff *skb) static void tpacket_destruct_skb(struct sk_buff *skb)
{ {
struct packet_sock *po = pkt_sk(skb->sk); struct packet_sock *po = pkt_sk(skb->sk);
void * ph; void *ph;
BUG_ON(skb == NULL); BUG_ON(skb == NULL);
...@@ -836,9 +836,9 @@ static void tpacket_destruct_skb(struct sk_buff *skb) ...@@ -836,9 +836,9 @@ static void tpacket_destruct_skb(struct sk_buff *skb)
sock_wfree(skb); sock_wfree(skb);
} }
static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb, static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
void * frame, struct net_device *dev, int size_max, void *frame, struct net_device *dev, int size_max,
__be16 proto, unsigned char * addr) __be16 proto, unsigned char *addr)
{ {
union { union {
struct tpacket_hdr *h1; struct tpacket_hdr *h1;
...@@ -867,8 +867,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb, ...@@ -867,8 +867,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb,
break; break;
} }
if (unlikely(tp_len > size_max)) { if (unlikely(tp_len > size_max)) {
printk(KERN_ERR "packet size is too long (%d > %d)\n", pr_err("packet size is too long (%d > %d)\n", tp_len, size_max);
tp_len, size_max);
return -EMSGSIZE; return -EMSGSIZE;
} }
...@@ -883,12 +882,11 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb, ...@@ -883,12 +882,11 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb,
NULL, tp_len); NULL, tp_len);
if (unlikely(err < 0)) if (unlikely(err < 0))
return -EINVAL; return -EINVAL;
} else if (dev->hard_header_len ) { } else if (dev->hard_header_len) {
/* net device doesn't like empty head */ /* net device doesn't like empty head */
if (unlikely(tp_len <= dev->hard_header_len)) { if (unlikely(tp_len <= dev->hard_header_len)) {
printk(KERN_ERR "packet size is too short " pr_err("packet size is too short (%d < %d)\n",
"(%d < %d)\n", tp_len, tp_len, dev->hard_header_len);
dev->hard_header_len);
return -EINVAL; return -EINVAL;
} }
...@@ -917,8 +915,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb, ...@@ -917,8 +915,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff * skb,
nr_frags = skb_shinfo(skb)->nr_frags; nr_frags = skb_shinfo(skb)->nr_frags;
if (unlikely(nr_frags >= MAX_SKB_FRAGS)) { if (unlikely(nr_frags >= MAX_SKB_FRAGS)) {
printk(KERN_ERR "Packet exceed the number " pr_err("Packet exceed the number of skb frags(%lu)\n",
"of skb frags(%lu)\n",
MAX_SKB_FRAGS); MAX_SKB_FRAGS);
return -EFAULT; return -EFAULT;
} }
...@@ -944,8 +941,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) ...@@ -944,8 +941,8 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
struct net_device *dev; struct net_device *dev;
__be16 proto; __be16 proto;
int ifindex, err, reserve = 0; int ifindex, err, reserve = 0;
void * ph; void *ph;
struct sockaddr_ll *saddr=(struct sockaddr_ll *)msg->msg_name; struct sockaddr_ll *saddr = (struct sockaddr_ll *)msg->msg_name;
int tp_len, size_max; int tp_len, size_max;
unsigned char *addr; unsigned char *addr;
int len_sum = 0; int len_sum = 0;
...@@ -1038,8 +1035,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) ...@@ -1038,8 +1035,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
goto out_xmit; goto out_xmit;
packet_increment_head(&po->tx_ring); packet_increment_head(&po->tx_ring);
len_sum += tp_len; len_sum += tp_len;
} } while (likely((ph != NULL) || ((!(msg->msg_flags & MSG_DONTWAIT))
while (likely((ph != NULL) || ((!(msg->msg_flags & MSG_DONTWAIT))
&& (atomic_read(&po->tx_ring.pending)))) && (atomic_read(&po->tx_ring.pending))))
); );
...@@ -1064,7 +1060,7 @@ static int packet_snd(struct socket *sock, ...@@ -1064,7 +1060,7 @@ static int packet_snd(struct socket *sock,
struct msghdr *msg, size_t len) struct msghdr *msg, size_t len)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct sockaddr_ll *saddr=(struct sockaddr_ll *)msg->msg_name; struct sockaddr_ll *saddr = (struct sockaddr_ll *)msg->msg_name;
struct sk_buff *skb; struct sk_buff *skb;
struct net_device *dev; struct net_device *dev;
__be16 proto; __be16 proto;
...@@ -1110,7 +1106,7 @@ static int packet_snd(struct socket *sock, ...@@ -1110,7 +1106,7 @@ static int packet_snd(struct socket *sock,
skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev), skb = sock_alloc_send_skb(sk, len + LL_ALLOCATED_SPACE(dev),
msg->msg_flags & MSG_DONTWAIT, &err); msg->msg_flags & MSG_DONTWAIT, &err);
if (skb==NULL) if (skb == NULL)
goto out_unlock; goto out_unlock;
skb_reserve(skb, LL_RESERVED_SPACE(dev)); skb_reserve(skb, LL_RESERVED_SPACE(dev));
...@@ -1122,7 +1118,7 @@ static int packet_snd(struct socket *sock, ...@@ -1122,7 +1118,7 @@ static int packet_snd(struct socket *sock,
goto out_free; goto out_free;
/* Returns -EFAULT on error */ /* Returns -EFAULT on error */
err = memcpy_fromiovec(skb_put(skb,len), msg->msg_iov, len); err = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
if (err) if (err)
goto out_free; goto out_free;
...@@ -1140,7 +1136,7 @@ static int packet_snd(struct socket *sock, ...@@ -1140,7 +1136,7 @@ static int packet_snd(struct socket *sock,
dev_put(dev); dev_put(dev);
return(len); return len;
out_free: out_free:
kfree_skb(skb); kfree_skb(skb);
...@@ -1283,9 +1279,10 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc ...@@ -1283,9 +1279,10 @@ static int packet_do_bind(struct sock *sk, struct net_device *dev, __be16 protoc
* Bind a packet socket to a device * Bind a packet socket to a device
*/ */
static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int addr_len) static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr,
int addr_len)
{ {
struct sock *sk=sock->sk; struct sock *sk = sock->sk;
char name[15]; char name[15];
struct net_device *dev; struct net_device *dev;
int err = -ENODEV; int err = -ENODEV;
...@@ -1296,7 +1293,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add ...@@ -1296,7 +1293,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add
if (addr_len != sizeof(struct sockaddr)) if (addr_len != sizeof(struct sockaddr))
return -EINVAL; return -EINVAL;
strlcpy(name,uaddr->sa_data,sizeof(name)); strlcpy(name, uaddr->sa_data, sizeof(name));
dev = dev_get_by_name(sock_net(sk), name); dev = dev_get_by_name(sock_net(sk), name);
if (dev) { if (dev) {
...@@ -1308,8 +1305,8 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add ...@@ -1308,8 +1305,8 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int add
static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) static int packet_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
{ {
struct sockaddr_ll *sll = (struct sockaddr_ll*)uaddr; struct sockaddr_ll *sll = (struct sockaddr_ll *)uaddr;
struct sock *sk=sock->sk; struct sock *sk = sock->sk;
struct net_device *dev = NULL; struct net_device *dev = NULL;
int err; int err;
...@@ -1404,7 +1401,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol) ...@@ -1404,7 +1401,7 @@ static int packet_create(struct net *net, struct socket *sock, int protocol)
sk_add_node(sk, &net->packet.sklist); sk_add_node(sk, &net->packet.sklist);
sock_prot_inuse_add(net, &packet_proto, 1); sock_prot_inuse_add(net, &packet_proto, 1);
write_unlock_bh(&net->packet.sklist_lock); write_unlock_bh(&net->packet.sklist_lock);
return(0); return 0;
out: out:
return err; return err;
} }
...@@ -1441,7 +1438,7 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -1441,7 +1438,7 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
* but then it will block. * but then it will block.
*/ */
skb=skb_recv_datagram(sk,flags,flags&MSG_DONTWAIT,&err); skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err);
/* /*
* An error occurred so return it. Because skb_recv_datagram() * An error occurred so return it. Because skb_recv_datagram()
...@@ -1469,10 +1466,9 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock, ...@@ -1469,10 +1466,9 @@ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock,
*/ */
copied = skb->len; copied = skb->len;
if (copied > len) if (copied > len) {
{ copied = len;
copied=len; msg->msg_flags |= MSG_TRUNC;
msg->msg_flags|=MSG_TRUNC;
} }
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
...@@ -1539,7 +1535,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr, ...@@ -1539,7 +1535,7 @@ static int packet_getname(struct socket *sock, struct sockaddr *uaddr,
struct net_device *dev; struct net_device *dev;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct packet_sock *po = pkt_sk(sk); struct packet_sock *po = pkt_sk(sk);
struct sockaddr_ll *sll = (struct sockaddr_ll*)uaddr; struct sockaddr_ll *sll = (struct sockaddr_ll *)uaddr;
if (peer) if (peer)
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -1584,14 +1580,15 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i, ...@@ -1584,14 +1580,15 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
else else
return dev_unicast_delete(dev, i->addr); return dev_unicast_delete(dev, i->addr);
break; break;
default:; default:
break;
} }
return 0; return 0;
} }
static void packet_dev_mclist(struct net_device *dev, struct packet_mclist *i, int what) static void packet_dev_mclist(struct net_device *dev, struct packet_mclist *i, int what)
{ {
for ( ; i; i=i->next) { for ( ; i; i = i->next) {
if (i->ifindex == dev->ifindex) if (i->ifindex == dev->ifindex)
packet_dev_mc(dev, i, what); packet_dev_mc(dev, i, what);
} }
...@@ -1693,7 +1690,8 @@ static void packet_flush_mclist(struct sock *sk) ...@@ -1693,7 +1690,8 @@ static void packet_flush_mclist(struct sock *sk)
struct net_device *dev; struct net_device *dev;
po->mclist = ml->next; po->mclist = ml->next;
if ((dev = dev_get_by_index(sock_net(sk), ml->ifindex)) != NULL) { dev = dev_get_by_index(sock_net(sk), ml->ifindex);
if (dev != NULL) {
packet_dev_mc(dev, ml, -1); packet_dev_mc(dev, ml, -1);
dev_put(dev); dev_put(dev);
} }
...@@ -1723,7 +1721,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv ...@@ -1723,7 +1721,7 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
return -EINVAL; return -EINVAL;
if (len > sizeof(mreq)) if (len > sizeof(mreq))
len = sizeof(mreq); len = sizeof(mreq);
if (copy_from_user(&mreq,optval,len)) if (copy_from_user(&mreq, optval, len))
return -EFAULT; return -EFAULT;
if (len < (mreq.mr_alen + offsetof(struct packet_mreq, mr_address))) if (len < (mreq.mr_alen + offsetof(struct packet_mreq, mr_address)))
return -EINVAL; return -EINVAL;
...@@ -1740,9 +1738,9 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv ...@@ -1740,9 +1738,9 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
{ {
struct tpacket_req req; struct tpacket_req req;
if (optlen<sizeof(req)) if (optlen < sizeof(req))
return -EINVAL; return -EINVAL;
if (copy_from_user(&req,optval,sizeof(req))) if (copy_from_user(&req, optval, sizeof(req)))
return -EFAULT; return -EFAULT;
return packet_set_ring(sk, &req, 0, optname == PACKET_TX_RING); return packet_set_ring(sk, &req, 0, optname == PACKET_TX_RING);
} }
...@@ -1750,9 +1748,9 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv ...@@ -1750,9 +1748,9 @@ packet_setsockopt(struct socket *sock, int level, int optname, char __user *optv
{ {
int val; int val;
if (optlen!=sizeof(val)) if (optlen != sizeof(val))
return -EINVAL; return -EINVAL;
if (copy_from_user(&val,optval,sizeof(val))) if (copy_from_user(&val, optval, sizeof(val)))
return -EFAULT; return -EFAULT;
pkt_sk(sk)->copy_thresh = val; pkt_sk(sk)->copy_thresh = val;
...@@ -2039,7 +2037,7 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd, ...@@ -2039,7 +2037,7 @@ static int packet_ioctl(struct socket *sock, unsigned int cmd,
#define packet_poll datagram_poll #define packet_poll datagram_poll
#else #else
static unsigned int packet_poll(struct file * file, struct socket *sock, static unsigned int packet_poll(struct file *file, struct socket *sock,
poll_table *wait) poll_table *wait)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -2069,7 +2067,7 @@ static unsigned int packet_poll(struct file * file, struct socket *sock, ...@@ -2069,7 +2067,7 @@ static unsigned int packet_poll(struct file * file, struct socket *sock,
static void packet_mm_open(struct vm_area_struct *vma) static void packet_mm_open(struct vm_area_struct *vma)
{ {
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
struct socket * sock = file->private_data; struct socket *sock = file->private_data;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
if (sk) if (sk)
...@@ -2079,7 +2077,7 @@ static void packet_mm_open(struct vm_area_struct *vma) ...@@ -2079,7 +2077,7 @@ static void packet_mm_open(struct vm_area_struct *vma)
static void packet_mm_close(struct vm_area_struct *vma) static void packet_mm_close(struct vm_area_struct *vma)
{ {
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
struct socket * sock = file->private_data; struct socket *sock = file->private_data;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
if (sk) if (sk)
...@@ -2088,7 +2086,7 @@ static void packet_mm_close(struct vm_area_struct *vma) ...@@ -2088,7 +2086,7 @@ static void packet_mm_close(struct vm_area_struct *vma)
static struct vm_operations_struct packet_mmap_ops = { static struct vm_operations_struct packet_mmap_ops = {
.open = packet_mm_open, .open = packet_mm_open,
.close =packet_mm_close, .close = packet_mm_close,
}; };
static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len) static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len)
...@@ -2239,7 +2237,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, ...@@ -2239,7 +2237,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req,
skb_queue_purge(rb_queue); skb_queue_purge(rb_queue);
#undef XC #undef XC
if (atomic_read(&po->mapped)) if (atomic_read(&po->mapped))
printk(KERN_DEBUG "packet_mmap: vma is busy: %d\n", pr_err("packet_mmap: vma is busy: %d\n",
atomic_read(&po->mapped)); atomic_read(&po->mapped));
} }
mutex_unlock(&po->pg_vec_lock); mutex_unlock(&po->pg_vec_lock);
...@@ -2303,7 +2301,7 @@ static int packet_mmap(struct file *file, struct socket *sock, ...@@ -2303,7 +2301,7 @@ static int packet_mmap(struct file *file, struct socket *sock,
int pg_num; int pg_num;
for (pg_num = 0; pg_num < rb->pg_vec_pages; for (pg_num = 0; pg_num < rb->pg_vec_pages;
pg_num++,page++) { pg_num++, page++) {
err = vm_insert_page(vma, start, page); err = vm_insert_page(vma, start, page);
if (unlikely(err)) if (unlikely(err))
goto out; goto out;
...@@ -2372,7 +2370,7 @@ static struct net_proto_family packet_family_ops = { ...@@ -2372,7 +2370,7 @@ static struct net_proto_family packet_family_ops = {
}; };
static struct notifier_block packet_netdev_notifier = { static struct notifier_block packet_netdev_notifier = {
.notifier_call =packet_notifier, .notifier_call = packet_notifier,
}; };
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -2402,7 +2400,7 @@ static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos) ...@@ -2402,7 +2400,7 @@ static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos)
++*pos; ++*pos;
return (v == SEQ_START_TOKEN) return (v == SEQ_START_TOKEN)
? sk_head(&net->packet.sklist) ? sk_head(&net->packet.sklist)
: sk_next((struct sock*)v) ; : sk_next((struct sock *)v) ;
} }
static void packet_seq_stop(struct seq_file *seq, void *v) static void packet_seq_stop(struct seq_file *seq, void *v)
...@@ -2430,7 +2428,7 @@ static int packet_seq_show(struct seq_file *seq, void *v) ...@@ -2430,7 +2428,7 @@ static int packet_seq_show(struct seq_file *seq, void *v)
po->running, po->running,
atomic_read(&s->sk_rmem_alloc), atomic_read(&s->sk_rmem_alloc),
sock_i_uid(s), sock_i_uid(s),
sock_i_ino(s) ); sock_i_ino(s));
} }
return 0; return 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7