| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | /* net/atm/resources.c - Statically allocated resources */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Written 1995-2000 by Werner Almesberger, EPFL LRC/ICA */ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /* Fixes
 | 
					
						
							|  |  |  |  * Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 
					
						
							|  |  |  |  * 2002/01 - don't free the whole struct sock on sk->destruct time, | 
					
						
							|  |  |  |  * 	     use the default destruct function initialized by sock_init_data */ | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:00 +00:00
										 |  |  | #define pr_fmt(fmt) KBUILD_MODNAME ":%s: " fmt, __func__
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | #include <linux/ctype.h>
 | 
					
						
							|  |  |  | #include <linux/string.h>
 | 
					
						
							|  |  |  | #include <linux/atmdev.h>
 | 
					
						
							|  |  |  | #include <linux/sonet.h>
 | 
					
						
							|  |  |  | #include <linux/kernel.h> /* for barrier */
 | 
					
						
							|  |  |  | #include <linux/module.h>
 | 
					
						
							|  |  |  | #include <linux/bitops.h>
 | 
					
						
							| 
									
										
										
										
											2006-01-11 12:17:47 -08:00
										 |  |  | #include <linux/capability.h>
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | #include <linux/delay.h>
 | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | #include <linux/mutex.h>
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | #include <net/sock.h>	 /* for struct sock */
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "common.h"
 | 
					
						
							|  |  |  | #include "resources.h"
 | 
					
						
							|  |  |  | #include "addr.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | LIST_HEAD(atm_devs); | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | DEFINE_MUTEX(atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | static struct atm_dev *__alloc_atm_dev(const char *type) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct atm_dev *dev; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-07-21 14:51:30 -07:00
										 |  |  | 	dev = kzalloc(sizeof(*dev), GFP_KERNEL); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	if (!dev) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							|  |  |  | 	dev->type = type; | 
					
						
							|  |  |  | 	dev->signal = ATM_PHY_SIG_UNKNOWN; | 
					
						
							|  |  |  | 	dev->link_rate = ATM_OC3_PCR; | 
					
						
							|  |  |  | 	spin_lock_init(&dev->lock); | 
					
						
							|  |  |  | 	INIT_LIST_HEAD(&dev->local); | 
					
						
							| 
									
										
										
										
											2005-10-06 22:19:28 -07:00
										 |  |  | 	INIT_LIST_HEAD(&dev->lecs); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	return dev; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static struct atm_dev *__atm_dev_lookup(int number) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct atm_dev *dev; | 
					
						
							|  |  |  | 	struct list_head *p; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	list_for_each(p, &atm_devs) { | 
					
						
							|  |  |  | 		dev = list_entry(p, struct atm_dev, dev_list); | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:21 -08:00
										 |  |  | 		if (dev->number == number) { | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 			atm_dev_hold(dev); | 
					
						
							|  |  |  | 			return dev; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return NULL; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | struct atm_dev *atm_dev_lookup(int number) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct atm_dev *dev; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 	mutex_lock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	dev = __atm_dev_lookup(number); | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 	mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	return dev; | 
					
						
							|  |  |  | } | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | EXPORT_SYMBOL(atm_dev_lookup); | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | struct atm_dev *atm_dev_register(const char *type, const struct atmdev_ops *ops, | 
					
						
							|  |  |  | 				 int number, unsigned long *flags) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | 	struct atm_dev *dev, *inuse; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	dev = __alloc_atm_dev(type); | 
					
						
							|  |  |  | 	if (!dev) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:00 +00:00
										 |  |  | 		pr_err("no space for dev %s\n", type); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 		return NULL; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 	mutex_lock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	if (number != -1) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		inuse = __atm_dev_lookup(number); | 
					
						
							|  |  |  | 		if (inuse) { | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 			atm_dev_put(inuse); | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 			mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-21 16:48:26 -07:00
										 |  |  | 			kfree(dev); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 			return NULL; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		dev->number = number; | 
					
						
							|  |  |  | 	} else { | 
					
						
							|  |  |  | 		dev->number = 0; | 
					
						
							|  |  |  | 		while ((inuse = __atm_dev_lookup(dev->number))) { | 
					
						
							|  |  |  | 			atm_dev_put(inuse); | 
					
						
							|  |  |  | 			dev->number++; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	dev->ops = ops; | 
					
						
							|  |  |  | 	if (flags) | 
					
						
							|  |  |  | 		dev->flags = *flags; | 
					
						
							|  |  |  | 	else | 
					
						
							|  |  |  | 		memset(&dev->flags, 0, sizeof(dev->flags)); | 
					
						
							|  |  |  | 	memset(&dev->stats, 0, sizeof(dev->stats)); | 
					
						
							|  |  |  | 	atomic_set(&dev->refcnt, 1); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (atm_proc_dev_register(dev) < 0) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:00 +00:00
										 |  |  | 		pr_err("atm_proc_dev_register failed for dev %s\n", type); | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | 		goto out_fail; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if (atm_register_sysfs(dev) < 0) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:00 +00:00
										 |  |  | 		pr_err("atm_register_sysfs failed for dev %s\n", type); | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | 		atm_proc_dev_deregister(dev); | 
					
						
							|  |  |  | 		goto out_fail; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:21 -08:00
										 |  |  | 	list_add_tail(&dev->dev_list, &atm_devs); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | out: | 
					
						
							|  |  |  | 	mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	return dev; | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | out_fail: | 
					
						
							|  |  |  | 	kfree(dev); | 
					
						
							|  |  |  | 	dev = NULL; | 
					
						
							|  |  |  | 	goto out; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | EXPORT_SYMBOL(atm_dev_register); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | void atm_dev_deregister(struct atm_dev *dev) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 	BUG_ON(test_bit(ATM_DF_REMOVED, &dev->flags)); | 
					
						
							|  |  |  | 	set_bit(ATM_DF_REMOVED, &dev->flags); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	/*
 | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 	 * if we remove current device from atm_devs list, new device | 
					
						
							|  |  |  | 	 * with same number can appear, such we need deregister proc, | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 	 * release async all vccs and remove them from vccs list too | 
					
						
							|  |  |  | 	 */ | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 	mutex_lock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	list_del(&dev->dev_list); | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 	mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 	atm_dev_release_vccs(dev); | 
					
						
							| 
									
										
										
										
											2006-06-29 12:36:34 -07:00
										 |  |  | 	atm_unregister_sysfs(dev); | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 	atm_proc_dev_deregister(dev); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-11-29 16:16:41 -08:00
										 |  |  | 	atm_dev_put(dev); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | EXPORT_SYMBOL(atm_dev_deregister); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | static void copy_aal_stats(struct k_atm_aal_stats *from, | 
					
						
							|  |  |  |     struct atm_aal_stats *to) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | #define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
 | 
					
						
							|  |  |  | 	__AAL_STAT_ITEMS | 
					
						
							|  |  |  | #undef __HANDLE_ITEM
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void subtract_aal_stats(struct k_atm_aal_stats *from, | 
					
						
							|  |  |  |     struct atm_aal_stats *to) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  | #define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
 | 
					
						
							|  |  |  | 	__AAL_STAT_ITEMS | 
					
						
							|  |  |  | #undef __HANDLE_ITEM
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | static int fetch_stats(struct atm_dev *dev, struct atm_dev_stats __user *arg, | 
					
						
							|  |  |  | 		       int zero) | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | { | 
					
						
							|  |  |  | 	struct atm_dev_stats tmp; | 
					
						
							|  |  |  | 	int error = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	copy_aal_stats(&dev->stats.aal0, &tmp.aal0); | 
					
						
							|  |  |  | 	copy_aal_stats(&dev->stats.aal34, &tmp.aal34); | 
					
						
							|  |  |  | 	copy_aal_stats(&dev->stats.aal5, &tmp.aal5); | 
					
						
							|  |  |  | 	if (arg) | 
					
						
							|  |  |  | 		error = copy_to_user(arg, &tmp, sizeof(tmp)); | 
					
						
							|  |  |  | 	if (zero && !error) { | 
					
						
							|  |  |  | 		subtract_aal_stats(&dev->stats.aal0, &tmp.aal0); | 
					
						
							|  |  |  | 		subtract_aal_stats(&dev->stats.aal34, &tmp.aal34); | 
					
						
							|  |  |  | 		subtract_aal_stats(&dev->stats.aal5, &tmp.aal5); | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	return error ? -EFAULT : 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | int atm_dev_ioctl(unsigned int cmd, void __user *arg, int compat) | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | { | 
					
						
							|  |  |  | 	void __user *buf; | 
					
						
							|  |  |  | 	int error, len, number, size = 0; | 
					
						
							|  |  |  | 	struct atm_dev *dev; | 
					
						
							|  |  |  | 	struct list_head *p; | 
					
						
							|  |  |  | 	int *tmp_buf, *tmp_p; | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | 	int __user *sioc_len; | 
					
						
							|  |  |  | 	int __user *iobuf_len; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #ifndef CONFIG_COMPAT
 | 
					
						
							|  |  |  | 	compat = 0; /* Just so the compiler _knows_ */ | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	switch (cmd) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 	case ATM_GETNAMES: | 
					
						
							|  |  |  | 		if (compat) { | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | #ifdef CONFIG_COMPAT
 | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 			struct compat_atm_iobuf __user *ciobuf = arg; | 
					
						
							|  |  |  | 			compat_uptr_t cbuf; | 
					
						
							|  |  |  | 			iobuf_len = &ciobuf->length; | 
					
						
							|  |  |  | 			if (get_user(cbuf, &ciobuf->buffer)) | 
					
						
							|  |  |  | 				return -EFAULT; | 
					
						
							|  |  |  | 			buf = compat_ptr(cbuf); | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		} else { | 
					
						
							|  |  |  | 			struct atm_iobuf __user *iobuf = arg; | 
					
						
							|  |  |  | 			iobuf_len = &iobuf->length; | 
					
						
							|  |  |  | 			if (get_user(buf, &iobuf->buffer)) | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 				return -EFAULT; | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 		if (get_user(len, iobuf_len)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 		mutex_lock(&atm_dev_mutex); | 
					
						
							|  |  |  | 		list_for_each(p, &atm_devs) | 
					
						
							|  |  |  | 			size += sizeof(int); | 
					
						
							|  |  |  | 		if (size > len) { | 
					
						
							| 
									
										
										
										
											2006-03-20 22:35:41 -08:00
										 |  |  | 			mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 			return -E2BIG; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		tmp_buf = kmalloc(size, GFP_ATOMIC); | 
					
						
							|  |  |  | 		if (!tmp_buf) { | 
					
						
							|  |  |  | 			mutex_unlock(&atm_dev_mutex); | 
					
						
							|  |  |  | 			return -ENOMEM; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		tmp_p = tmp_buf; | 
					
						
							|  |  |  | 		list_for_each(p, &atm_devs) { | 
					
						
							|  |  |  | 			dev = list_entry(p, struct atm_dev, dev_list); | 
					
						
							|  |  |  | 			*tmp_p++ = dev->number; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		mutex_unlock(&atm_dev_mutex); | 
					
						
							|  |  |  | 		error = ((copy_to_user(buf, tmp_buf, size)) || | 
					
						
							|  |  |  | 			 put_user(size, iobuf_len)) | 
					
						
							|  |  |  | 			? -EFAULT : 0; | 
					
						
							|  |  |  | 		kfree(tmp_buf); | 
					
						
							|  |  |  | 		return error; | 
					
						
							|  |  |  | 	default: | 
					
						
							|  |  |  | 		break; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | 	if (compat) { | 
					
						
							|  |  |  | #ifdef CONFIG_COMPAT
 | 
					
						
							|  |  |  | 		struct compat_atmif_sioc __user *csioc = arg; | 
					
						
							|  |  |  | 		compat_uptr_t carg; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		sioc_len = &csioc->length; | 
					
						
							|  |  |  | 		if (get_user(carg, &csioc->arg)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 		buf = compat_ptr(carg); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (get_user(len, &csioc->length)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 		if (get_user(number, &csioc->number)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 	} else { | 
					
						
							|  |  |  | 		struct atmif_sioc __user *sioc = arg; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		sioc_len = &sioc->length; | 
					
						
							|  |  |  | 		if (get_user(buf, &sioc->arg)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 		if (get_user(len, &sioc->length)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 		if (get_user(number, &sioc->number)) | 
					
						
							|  |  |  | 			return -EFAULT; | 
					
						
							|  |  |  | 	} | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	dev = try_then_request_module(atm_dev_lookup(number), "atm-device-%d", | 
					
						
							|  |  |  | 				      number); | 
					
						
							|  |  |  | 	if (!dev) | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 		return -ENODEV; | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	switch (cmd) { | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 	case ATM_GETTYPE: | 
					
						
							|  |  |  | 		size = strlen(dev->type) + 1; | 
					
						
							|  |  |  | 		if (copy_to_user(buf, dev->type, size)) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_GETESI: | 
					
						
							|  |  |  | 		size = ESI_LEN; | 
					
						
							|  |  |  | 		if (copy_to_user(buf, dev->esi, size)) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_SETESI: | 
					
						
							|  |  |  | 	{ | 
					
						
							|  |  |  | 		int i; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		for (i = 0; i < ESI_LEN; i++) | 
					
						
							|  |  |  | 			if (dev->esi[i]) { | 
					
						
							|  |  |  | 				error = -EEXIST; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 				goto done; | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 	} | 
					
						
							|  |  |  | 	/* fall through */ | 
					
						
							|  |  |  | 	case ATM_SETESIF: | 
					
						
							|  |  |  | 	{ | 
					
						
							|  |  |  | 		unsigned char esi[ESI_LEN]; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (!capable(CAP_NET_ADMIN)) { | 
					
						
							|  |  |  | 			error = -EPERM; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		if (copy_from_user(esi, buf, ESI_LEN)) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		memcpy(dev->esi, esi, ESI_LEN); | 
					
						
							|  |  |  | 		error =  ESI_LEN; | 
					
						
							|  |  |  | 		goto done; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	case ATM_GETSTATZ: | 
					
						
							|  |  |  | 		if (!capable(CAP_NET_ADMIN)) { | 
					
						
							|  |  |  | 			error = -EPERM; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		/* fall through */ | 
					
						
							|  |  |  | 	case ATM_GETSTAT: | 
					
						
							|  |  |  | 		size = sizeof(struct atm_dev_stats); | 
					
						
							|  |  |  | 		error = fetch_stats(dev, buf, cmd == ATM_GETSTATZ); | 
					
						
							|  |  |  | 		if (error) | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_GETCIRANGE: | 
					
						
							|  |  |  | 		size = sizeof(struct atm_cirange); | 
					
						
							|  |  |  | 		if (copy_to_user(buf, &dev->ci_range, size)) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_GETLINKRATE: | 
					
						
							|  |  |  | 		size = sizeof(int); | 
					
						
							|  |  |  | 		if (copy_to_user(buf, &dev->link_rate, size)) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_RSTADDR: | 
					
						
							|  |  |  | 		if (!capable(CAP_NET_ADMIN)) { | 
					
						
							|  |  |  | 			error = -EPERM; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		atm_reset_addr(dev, ATM_ADDR_LOCAL); | 
					
						
							|  |  |  | 		break; | 
					
						
							|  |  |  | 	case ATM_ADDADDR: | 
					
						
							|  |  |  | 	case ATM_DELADDR: | 
					
						
							|  |  |  | 	case ATM_ADDLECSADDR: | 
					
						
							|  |  |  | 	case ATM_DELLECSADDR: | 
					
						
							|  |  |  | 	{ | 
					
						
							|  |  |  | 		struct sockaddr_atmsvc addr; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (!capable(CAP_NET_ADMIN)) { | 
					
						
							|  |  |  | 			error = -EPERM; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 		if (copy_from_user(&addr, buf, sizeof(addr))) { | 
					
						
							|  |  |  | 			error = -EFAULT; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		if (cmd == ATM_ADDADDR || cmd == ATM_ADDLECSADDR) | 
					
						
							|  |  |  | 			error = atm_add_addr(dev, &addr, | 
					
						
							|  |  |  | 					     (cmd == ATM_ADDADDR ? | 
					
						
							| 
									
										
										
										
											2005-10-06 22:19:28 -07:00
										 |  |  | 					      ATM_ADDR_LOCAL : ATM_ADDR_LECS)); | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		else | 
					
						
							|  |  |  | 			error = atm_del_addr(dev, &addr, | 
					
						
							|  |  |  | 					     (cmd == ATM_DELADDR ? | 
					
						
							|  |  |  | 					      ATM_ADDR_LOCAL : ATM_ADDR_LECS)); | 
					
						
							|  |  |  | 		goto done; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 	case ATM_GETADDR: | 
					
						
							|  |  |  | 	case ATM_GETLECSADDR: | 
					
						
							|  |  |  | 		error = atm_get_addr(dev, buf, len, | 
					
						
							|  |  |  | 				     (cmd == ATM_GETADDR ? | 
					
						
							|  |  |  | 				      ATM_ADDR_LOCAL : ATM_ADDR_LECS)); | 
					
						
							|  |  |  | 		if (error < 0) | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		size = error; | 
					
						
							|  |  |  | 		/* may return 0, but later on size == 0 means "don't
 | 
					
						
							|  |  |  | 		   write the length" */ | 
					
						
							|  |  |  | 		error = put_user(size, sioc_len) ? -EFAULT : 0; | 
					
						
							|  |  |  | 		goto done; | 
					
						
							|  |  |  | 	case ATM_SETLOOP: | 
					
						
							|  |  |  | 		if (__ATM_LM_XTRMT((int) (unsigned long) buf) && | 
					
						
							|  |  |  | 		    __ATM_LM_XTLOC((int) (unsigned long) buf) > | 
					
						
							|  |  |  | 		    __ATM_LM_XTRMT((int) (unsigned long) buf)) { | 
					
						
							|  |  |  | 			error = -EINVAL; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 			goto done; | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		} | 
					
						
							|  |  |  | 		/* fall through */ | 
					
						
							|  |  |  | 	case ATM_SETCIRANGE: | 
					
						
							|  |  |  | 	case SONET_GETSTATZ: | 
					
						
							|  |  |  | 	case SONET_SETDIAG: | 
					
						
							|  |  |  | 	case SONET_CLRDIAG: | 
					
						
							|  |  |  | 	case SONET_SETFRAMING: | 
					
						
							|  |  |  | 		if (!capable(CAP_NET_ADMIN)) { | 
					
						
							|  |  |  | 			error = -EPERM; | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		/* fall through */ | 
					
						
							|  |  |  | 	default: | 
					
						
							|  |  |  | 		if (compat) { | 
					
						
							|  |  |  | #ifdef CONFIG_COMPAT
 | 
					
						
							|  |  |  | 			if (!dev->ops->compat_ioctl) { | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 				error = -EINVAL; | 
					
						
							|  |  |  | 				goto done; | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 			size = dev->ops->compat_ioctl(dev, cmd, buf); | 
					
						
							| 
									
										
											  
											
												atm: 32-bit ioctl compatibility
We lack compat ioctl support through most of the ATM code. This patch
deals with most of it, and I can now at least use BR2684 and PPPoATM
with 32-bit userspace.
I haven't added a .compat_ioctl method to struct atm_ioctl, because
AFAICT none of the current users need any conversion -- so we can just
call the ->ioctl() method in every case. I looked at br2684, clip, lec,
mpc, pppoatm and atmtcp.
In svc_compat_ioctl() the only mangling which is needed is to change
COMPAT_ATM_ADDPARTY to ATM_ADDPARTY. Although it's defined as
	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
it doesn't actually _take_ a struct atm_iobuf as an argument -- it takes
a struct sockaddr_atmsvc, which _is_ the same between 32-bit and 64-bit
code, so doesn't need conversion.
Almost all of vcc_ioctl() would have been identical, so I converted that
into a core do_vcc_ioctl() function with an 'int compat' argument.
I've done the same with atm_dev_ioctl(), where there _are_ a few
differences, but still it's relatively contained and there would
otherwise have been a lot of duplication.
I haven't done any of the actual device-specific ioctls, although I've
added a compat_ioctl method to struct atmdev_ops.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
											
										 
											2008-12-03 22:12:38 -08:00
										 |  |  | #endif
 | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		} else { | 
					
						
							|  |  |  | 			if (!dev->ops->ioctl) { | 
					
						
							|  |  |  | 				error = -EINVAL; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 				goto done; | 
					
						
							|  |  |  | 			} | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 			size = dev->ops->ioctl(dev, cmd, buf); | 
					
						
							|  |  |  | 		} | 
					
						
							|  |  |  | 		if (size < 0) { | 
					
						
							|  |  |  | 			error = (size == -ENOIOCTLCMD ? -EINVAL : size); | 
					
						
							|  |  |  | 			goto done; | 
					
						
							|  |  |  | 		} | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	if (size) | 
					
						
							| 
									
										
										
										
											2010-01-26 11:40:16 +00:00
										 |  |  | 		error = put_user(size, sioc_len) ? -EFAULT : 0; | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | 	else | 
					
						
							|  |  |  | 		error = 0; | 
					
						
							|  |  |  | done: | 
					
						
							|  |  |  | 	atm_dev_put(dev); | 
					
						
							|  |  |  | 	return error; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | void *atm_dev_seq_start(struct seq_file *seq, loff_t *pos) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 	mutex_lock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2010-02-08 23:21:51 +00:00
										 |  |  | 	return seq_list_start_head(&atm_devs, *pos); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | void atm_dev_seq_stop(struct seq_file *seq, void *v) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 	mutex_unlock(&atm_dev_mutex); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2007-02-09 23:24:29 +09:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | void *atm_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2010-02-08 23:21:51 +00:00
										 |  |  | 	return seq_list_next(v, &atm_devs, pos); | 
					
						
							| 
									
										
										
										
											2005-04-16 15:20:36 -07:00
										 |  |  | } |