#endif /* CONFIG_PPP_MULTILINK */
struct net_device_stats stats; /* statistics */
#ifdef CONFIG_PPP_FILTER
- struct sock_fprog pass_filter; /* filter for packets to pass */
- struct sock_fprog active_filter;/* filter for pkts to reset idle */
+ struct sock_filter *pass_filter; /* filter for packets to pass */
+ struct sock_filter *active_filter;/* filter for pkts to reset idle */
+ unsigned pass_len, active_len;
#endif /* CONFIG_PPP_FILTER */
};
return mask;
}
+#ifdef CONFIG_PPP_FILTER
+static int get_filter(void __user *arg, struct sock_filter **p)
+{
+ struct sock_fprog uprog;
+ struct sock_filter *code = NULL;
+ int len, err;
+
+ if (copy_from_user(&uprog, arg, sizeof(uprog)))
+ return -EFAULT;
+
+ if (uprog.len > BPF_MAXINSNS)
+ return -EINVAL;
+
+ if (!uprog.len) {
+ *p = NULL;
+ return 0;
+ }
+
+ len = uprog.len * sizeof(struct sock_filter);
+ code = kmalloc(len, GFP_KERNEL);
+ if (code == NULL)
+ return -ENOMEM;
+
+ if (copy_from_user(code, uprog.filter, len)) {
+ kfree(code);
+ return -EFAULT;
+ }
+
+ err = sk_chk_filter(code, uprog.len);
+ if (err) {
+ kfree(code);
+ return err;
+ }
+
+ *p = code;
+ return uprog.len;
+}
+#endif /* CONFIG_PPP_FILTER */
+
static int ppp_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct npioctl npi;
int unit, cflags;
struct slcompress *vj;
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
if (pf == 0)
return ppp_unattached_ioctl(pf, file, cmd, arg);
switch (cmd) {
case PPPIOCCONNECT:
- if (get_user(unit, (int *) arg))
+ if (get_user(unit, p))
break;
err = ppp_connect_channel(pch, unit);
break;
ppp = PF_TO_PPP(pf);
switch (cmd) {
case PPPIOCSMRU:
- if (get_user(val, (int *) arg))
+ if (get_user(val, p))
break;
ppp->mru = val;
err = 0;
break;
case PPPIOCSFLAGS:
- if (get_user(val, (int *) arg))
+ if (get_user(val, p))
break;
ppp_lock(ppp);
cflags = ppp->flags & ~val;
case PPPIOCGFLAGS:
val = ppp->flags | ppp->xstate | ppp->rstate;
- if (put_user(val, (int *) arg))
+ if (put_user(val, p))
break;
err = 0;
break;
break;
case PPPIOCGUNIT:
- if (put_user(ppp->file.index, (int *) arg))
+ if (put_user(ppp->file.index, p))
break;
err = 0;
break;
case PPPIOCSDEBUG:
- if (get_user(val, (int *) arg))
+ if (get_user(val, p))
break;
ppp->debug = val;
err = 0;
break;
case PPPIOCGDEBUG:
- if (put_user(ppp->debug, (int *) arg))
+ if (put_user(ppp->debug, p))
break;
err = 0;
break;
case PPPIOCGIDLE:
idle.xmit_idle = (jiffies - ppp->last_xmit) / HZ;
idle.recv_idle = (jiffies - ppp->last_recv) / HZ;
- if (copy_to_user((void __user *) arg, &idle, sizeof(idle)))
+ if (copy_to_user(argp, &idle, sizeof(idle)))
break;
err = 0;
break;
case PPPIOCSMAXCID:
- if (get_user(val, (int *) arg))
+ if (get_user(val, p))
break;
val2 = 15;
if ((val >> 16) != 0) {
case PPPIOCGNPMODE:
case PPPIOCSNPMODE:
- if (copy_from_user(&npi, (void __user *) arg, sizeof(npi)))
+ if (copy_from_user(&npi, argp, sizeof(npi)))
break;
err = proto_to_npindex(npi.protocol);
if (err < 0)
if (cmd == PPPIOCGNPMODE) {
err = -EFAULT;
npi.mode = ppp->npmode[i];
- if (copy_to_user((void __user *) arg, &npi, sizeof(npi)))
+ if (copy_to_user(argp, &npi, sizeof(npi)))
break;
} else {
ppp->npmode[i] = npi.mode;
#ifdef CONFIG_PPP_FILTER
case PPPIOCSPASS:
+ {
+ struct sock_filter *code;
+ err = get_filter(argp, &code);
+ if (err >= 0) {
+ ppp_lock(ppp);
+ kfree(ppp->pass_filter);
+ ppp->pass_filter = code;
+ ppp->pass_len = err;
+ ppp_unlock(ppp);
+ err = 0;
+ }
+ break;
+ }
case PPPIOCSACTIVE:
{
- struct sock_fprog uprog, *filtp;
- struct sock_filter *code = NULL;
- int len;
-
- if (copy_from_user(&uprog, (void __user *) arg, sizeof(uprog)))
- break;
- err = -EINVAL;
- if (uprog.len > BPF_MAXINSNS)
- break;
- err = -ENOMEM;
- if (uprog.len > 0) {
- len = uprog.len * sizeof(struct sock_filter);
- code = kmalloc(len, GFP_KERNEL);
- if (code == NULL)
- break;
- err = -EFAULT;
- if (copy_from_user(code, (void __user *) uprog.filter, len)) {
- kfree(code);
- break;
- }
- err = sk_chk_filter(code, uprog.len);
- if (err) {
- kfree(code);
- break;
- }
+ struct sock_filter *code;
+ err = get_filter(argp, &code);
+ if (err >= 0) {
+ ppp_lock(ppp);
+ kfree(ppp->active_filter);
+ ppp->active_filter = code;
+ ppp->active_len = err;
+ ppp_unlock(ppp);
+ err = 0;
}
- filtp = (cmd == PPPIOCSPASS)? &ppp->pass_filter: &ppp->active_filter;
- ppp_lock(ppp);
- if (filtp->filter)
- kfree(filtp->filter);
- filtp->filter = code;
- filtp->len = uprog.len;
- ppp_unlock(ppp);
- err = 0;
break;
}
#endif /* CONFIG_PPP_FILTER */
#ifdef CONFIG_PPP_MULTILINK
case PPPIOCSMRRU:
- if (get_user(val, (int *) arg))
+ if (get_user(val, p))
break;
ppp_recv_lock(ppp);
ppp->mrru = val;
int unit, err = -EFAULT;
struct ppp *ppp;
struct channel *chan;
+ int __user *p = (int __user *)arg;
switch (cmd) {
case PPPIOCNEWUNIT:
/* Create a new ppp unit */
- if (get_user(unit, (int *) arg))
+ if (get_user(unit, p))
break;
ppp = ppp_create_interface(unit, &err);
if (ppp == 0)
file->private_data = &ppp->file;
ppp->owner = file;
err = -EFAULT;
- if (put_user(ppp->file.index, (int *) arg))
+ if (put_user(ppp->file.index, p))
break;
err = 0;
break;
case PPPIOCATTACH:
/* Attach to an existing ppp unit */
- if (get_user(unit, (int *) arg))
+ if (get_user(unit, p))
break;
down(&all_ppp_sem);
err = -ENXIO;
break;
case PPPIOCATTCHAN:
- if (get_user(unit, (int *) arg))
+ if (get_user(unit, p))
break;
spin_lock_bh(&all_channels_lock);
err = -ENXIO;
*p = htons(4); /* indicate outbound in DLT_LINUX_SLL */;
}
- if (ppp->pass_filter.filter
- && sk_run_filter(skb, ppp->pass_filter.filter,
- ppp->pass_filter.len) == 0) {
+ if (ppp->pass_filter
+ && sk_run_filter(skb, ppp->pass_filter,
+ ppp->pass_len) == 0) {
if (ppp->debug & 1)
printk(KERN_DEBUG "PPP: outbound frame not passed\n");
kfree_skb(skb);
return;
}
/* if this packet passes the active filter, record the time */
- if (!(ppp->active_filter.filter
- && sk_run_filter(skb, ppp->active_filter.filter,
- ppp->active_filter.len) == 0))
+ if (!(ppp->active_filter
+ && sk_run_filter(skb, ppp->active_filter,
+ ppp->active_len) == 0))
ppp->last_xmit = jiffies;
skb_pull(skb, 2);
#else
*p = 0; /* indicate inbound in DLT_LINUX_SLL */
}
- if (ppp->pass_filter.filter
- && sk_run_filter(skb, ppp->pass_filter.filter,
- ppp->pass_filter.len) == 0) {
+ if (ppp->pass_filter
+ && sk_run_filter(skb, ppp->pass_filter,
+ ppp->pass_len) == 0) {
if (ppp->debug & 1)
printk(KERN_DEBUG "PPP: inbound frame not passed\n");
kfree_skb(skb);
return;
}
- if (!(ppp->active_filter.filter
- && sk_run_filter(skb, ppp->active_filter.filter,
- ppp->active_filter.len) == 0))
+ if (!(ppp->active_filter
+ && sk_run_filter(skb, ppp->active_filter,
+ ppp->active_len) == 0))
ppp->last_recv = jiffies;
skb_pull(skb, 2);
#else
skb_queue_purge(&ppp->mrq);
#endif /* CONFIG_PPP_MULTILINK */
#ifdef CONFIG_PPP_FILTER
- if (ppp->pass_filter.filter) {
- kfree(ppp->pass_filter.filter);
- ppp->pass_filter.filter = NULL;
+ if (ppp->pass_filter) {
+ kfree(ppp->pass_filter);
+ ppp->pass_filter = NULL;
}
- if (ppp->active_filter.filter) {
- kfree(ppp->active_filter.filter);
- ppp->active_filter.filter = 0;
+ if (ppp->active_filter) {
+ kfree(ppp->active_filter);
+ ppp->active_filter = 0;
}
#endif /* CONFIG_PPP_FILTER */