Menu
▾
▴
[LV-kern-commit] CVS: kernel-2.4/net/packet af_packet.c,1.1.1.2,1.2
|
From: Andy P. <at...@us...> - 2002-04-09 16:29:14
|
Update of /cvsroot/linux-vax/kernel-2.4/net/packet
In directory usw-pr-cvs1:/tmp/cvs-serv32481/packet
Modified Files:
af_packet.c
Log Message:
synch 2.4.15 commit 21
Index: af_packet.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/packet/af_packet.c,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -r1.1.1.2 -r1.2
--- af_packet.c 25 Feb 2001 23:14:56 -0000 1.1.1.2
+++ af_packet.c 9 Apr 2002 16:29:01 -0000 1.2
@@ -149,7 +149,7 @@
*/
/* List of all packet sockets. */
-static struct sock * packet_sklist = NULL;
+static struct sock * packet_sklist;
static rwlock_t packet_sklist_lock = RW_LOCK_UNLOCKED;
atomic_t packet_socks_nr;
@@ -404,6 +404,7 @@
struct sockaddr_ll *sll;
struct packet_opt *po;
u8 * skb_head = skb->data;
+ int skb_len = skb->len;
#ifdef CONFIG_FILTER
unsigned snaplen;
#endif
@@ -461,7 +462,7 @@
if (skb_head != skb->data) {
skb->data = skb_head;
- skb->len = skb->tail - skb->data;
+ skb->len = skb_len;
}
kfree_skb(skb);
skb = nskb;
@@ -479,8 +480,8 @@
sll->sll_halen = dev->hard_header_parse(skb, sll->sll_addr);
#ifdef CONFIG_FILTER
- if (skb->len > snaplen)
- __skb_trim(skb, snaplen);
+ if (pskb_trim(skb, snaplen))
+ goto drop_n_acct;
#endif
skb_set_owner_r(skb, sk);
@@ -502,7 +503,7 @@
#endif
if (skb_head != skb->data && skb_shared(skb)) {
skb->data = skb_head;
- skb->len = skb->tail - skb->data;
+ skb->len = skb_len;
}
drop:
kfree_skb(skb);
@@ -517,6 +518,7 @@
struct sockaddr_ll *sll;
struct tpacket_hdr *h;
u8 * skb_head = skb->data;
+ int skb_len = skb->len;
unsigned snaplen;
unsigned long status = TP_STATUS_LOSING|TP_STATUS_USER;
unsigned short macoff, netoff;
@@ -534,6 +536,8 @@
else if (skb->pkt_type == PACKET_OUTGOING) {
/* Special case: outgoing packets have ll header at head */
skb_pull(skb, skb->nh.raw - skb->data);
+ if (skb->ip_summed == CHECKSUM_HW)
+ status |= TP_STATUS_CSUMNOTREADY;
}
}
@@ -580,6 +584,8 @@
if ((int)snaplen < 0)
snaplen = 0;
}
+ if (snaplen > skb->len-skb->data_len)
+ snaplen = skb->len-skb->data_len;
spin_lock(&sk->receive_queue.lock);
h = po->iovec[po->head];
@@ -618,12 +624,24 @@
h->tp_status = status;
mb();
+ {
+ struct page *p_start, *p_end;
+ u8 *h_end = (u8 *)h + macoff + snaplen - 1;
+
+ p_start = virt_to_page(h);
+ p_end = virt_to_page(h_end);
+ while (p_start <= p_end) {
+ flush_dcache_page(p_start);
+ p_start++;
+ }
+ }
+
sk->data_ready(sk, 0);
drop_n_restore:
if (skb_head != skb->data && skb_shared(skb)) {
skb->data = skb_head;
- skb->len = skb->tail - skb->data;
+ skb->len = skb_len;
}
drop:
kfree_skb(skb);
@@ -682,7 +700,7 @@
if (len > dev->mtu+reserve)
goto out_unlock;
- skb = sock_alloc_send_skb(sk, len+dev->hard_header_len+15, 0,
+ skb = sock_alloc_send_skb(sk, len+dev->hard_header_len+15,
msg->msg_flags & MSG_DONTWAIT, &err);
if (skb==NULL)
goto out_unlock;
@@ -1051,8 +1069,7 @@
msg->msg_flags|=MSG_TRUNC;
}
- /* We can't use skb_copy_datagram here */
- err = memcpy_toiovec(msg->msg_iov, skb->data, copied);
+ err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
if (err)
goto out_free;
@@ -1318,6 +1335,9 @@
if (get_user(len,optlen))
return -EFAULT;
+ if (len < 0)
+ return -EINVAL;
+
switch(optname) {
case PACKET_STATISTICS:
{
@@ -1399,11 +1419,10 @@
}
-static int packet_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
+static int packet_ioctl(struct socket *sock, unsigned int cmd,
+ unsigned long arg)
{
struct sock *sk = sock->sk;
- int err;
- int pid;
switch(cmd)
{
@@ -1425,25 +1444,26 @@
return put_user(amount, (int *)arg);
}
case FIOSETOWN:
- case SIOCSPGRP:
- err = get_user(pid, (int *) arg);
- if (err)
- return err;
+ case SIOCSPGRP: {
+ int pid;
+ if (get_user(pid, (int *) arg))
+ return -EFAULT;
if (current->pid != pid && current->pgrp != -pid &&
!capable(CAP_NET_ADMIN))
return -EPERM;
sk->proc = pid;
- return(0);
+ break;
+ }
case FIOGETOWN:
case SIOCGPGRP:
return put_user(sk->proc, (int *)arg);
case SIOCGSTAMP:
if(sk->stamp.tv_sec==0)
return -ENOENT;
- err = -EFAULT;
- if (!copy_to_user((void *)arg, &sk->stamp, sizeof(struct timeval)))
- err = 0;
- return err;
+ if (copy_to_user((void *)arg, &sk->stamp,
+ sizeof(struct timeval)))
+ return -EFAULT;
+ break;
case SIOCGIFFLAGS:
#ifndef CONFIG_INET
case SIOCSIFFLAGS:
@@ -1480,16 +1500,15 @@
return br_ioctl_hook(arg);
#endif
#endif
+ return -ENOPKG;
case SIOCGIFDIVERT:
case SIOCSIFDIVERT:
#ifdef CONFIG_NET_DIVERT
- return(divert_ioctl(cmd, (struct divert_cf *) arg));
+ return divert_ioctl(cmd, (struct divert_cf *) arg);
#else
return -ENOPKG;
#endif /* CONFIG_NET_DIVERT */
-
- return -ENOPKG;
#ifdef CONFIG_INET
case SIOCADDRT:
@@ -1522,8 +1541,7 @@
#endif
return -EOPNOTSUPP;
}
- /*NOTREACHED*/
- return(0);
+ return 0;
}
#ifndef CONFIG_PACKET_MMAP
@@ -1780,6 +1798,7 @@
sendmsg: packet_sendmsg_spkt,
recvmsg: packet_recvmsg,
mmap: sock_no_mmap,
+ sendpage: sock_no_sendpage,
};
#endif
@@ -1801,17 +1820,16 @@
sendmsg: packet_sendmsg,
recvmsg: packet_recvmsg,
mmap: packet_mmap,
+ sendpage: sock_no_sendpage,
};
static struct net_proto_family packet_family_ops = {
- PF_PACKET,
- packet_create
+ family: PF_PACKET,
+ create: packet_create,
};
-struct notifier_block packet_netdev_notifier={
- packet_notifier,
- NULL,
- 0
+static struct notifier_block packet_netdev_notifier = {
+ notifier_call: packet_notifier,
};
#ifdef CONFIG_PROC_FS
@@ -1864,19 +1882,14 @@
}
#endif
-
-
static void __exit packet_exit(void)
{
-#ifdef CONFIG_PROC_FS
remove_proc_entry("net/packet", 0);
-#endif
unregister_netdevice_notifier(&packet_netdev_notifier);
sock_unregister(PF_PACKET);
return;
}
-
static int __init packet_init(void)
{
sock_register(&packet_family_ops);
@@ -1886,7 +1899,6 @@
#endif
return 0;
}
-
module_init(packet_init);
module_exit(packet_exit);
|
