Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8865c418 authored by David Woodhouse's avatar David Woodhouse Committed by David S. Miller
Browse files

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: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dcd39c90

include/linux/atm.h

+14 −3
Original line number Diff line number Diff line
@@ -236,5 +236,16 @@ struct atmif_sioc { 
	void __user *arg;

};



#ifdef __KERNEL__

#ifdef CONFIG_COMPAT

#include <linux/compat.h>

struct compat_atmif_sioc {

	int number;

	int length;

	compat_uptr_t arg;

};

#endif

#endif



typedef unsigned short atm_backend_t;

#endif

include/linux/atmdev.h

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,10 @@ struct atm_dev_stats { 
					/* use backend to make new if */

#define ATM_ADDPARTY  	_IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)

 					/* add party to p2mp call */

#ifdef CONFIG_COMPAT

/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */

#define COMPAT_ATM_ADDPARTY  	_IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf)

#endif

#define ATM_DROPPARTY 	_IOW('a', ATMIOC_SPECIAL+5,int)

					/* drop party from p2mp call */
@@ -224,6 +228,13 @@ struct atm_cirange { 
extern struct proc_dir_entry *atm_proc_root;

#endif



#ifdef CONFIG_COMPAT

#include <linux/compat.h>

struct compat_atm_iobuf {

	int length;

	compat_uptr_t buffer;

};

#endif



struct k_atm_aal_stats {

#define __HANDLE_ITEM(i) atomic_t i
@@ -379,6 +390,10 @@ struct atmdev_ops { /* only send is required */ 
	int (*open)(struct atm_vcc *vcc);

	void (*close)(struct atm_vcc *vcc);

	int (*ioctl)(struct atm_dev *dev,unsigned int cmd,void __user *arg);

#ifdef CONFIG_COMPAT

	int (*compat_ioctl)(struct atm_dev *dev,unsigned int cmd,

			    void __user *arg);

#endif

	int (*getsockopt)(struct atm_vcc *vcc,int level,int optname,

	    void __user *optval,int optlen);

	int (*setsockopt)(struct atm_vcc *vcc,int level,int optname,

net/atm/common.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ int vcc_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *m, 
		size_t total_len);

unsigned int vcc_poll(struct file *file, struct socket *sock, poll_table *wait);

int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int vcc_setsockopt(struct socket *sock, int level, int optname,

		   char __user *optval, int optlen);

int vcc_getsockopt(struct socket *sock, int level, int optname,

net/atm/ioctl.c

+43 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/atmlec.h>

#include <linux/mutex.h>

#include <asm/ioctls.h>

#include <net/compat.h>



#include "resources.h"

#include "signaling.h"		/* for WAITING and sigd_attach */
@@ -46,7 +47,7 @@ void deregister_atm_ioctl(struct atm_ioctl *ioctl) 
EXPORT_SYMBOL(register_atm_ioctl);

EXPORT_SYMBOL(deregister_atm_ioctl);



int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg, int compat)

{

	struct sock *sk = sock->sk;

	struct atm_vcc *vcc;
@@ -80,13 +81,25 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
				goto done;

			}

		case SIOCGSTAMP: /* borrowed from IP */

#ifdef CONFIG_COMPAT

			if (compat)

				error = compat_sock_get_timestamp(sk, argp);

			else

#endif

				error = sock_get_timestamp(sk, argp);

			goto done;

		case SIOCGSTAMPNS: /* borrowed from IP */

#ifdef CONFIG_COMPAT

			if (compat)

				error = compat_sock_get_timestampns(sk, argp);

			else

#endif

				error = sock_get_timestampns(sk, argp);

			goto done;

		case ATM_SETSC:

			printk(KERN_WARNING "ATM_SETSC is obsolete\n");

			if (net_ratelimit())

				printk(KERN_WARNING "ATM_SETSC is obsolete; used by %s:%d\n",

				       current->comm, task_pid_nr(current));

			error = 0;

			goto done;

		case ATMSIGD_CTRL:
@@ -99,12 +112,23 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
			 * info uses kernel pointers as opaque references,

			 * so the holder of the file descriptor can scribble

			 * on the kernel... so we should make sure that we

			 * have the same privledges that /proc/kcore needs

			 * have the same privileges that /proc/kcore needs

			 */

			if (!capable(CAP_SYS_RAWIO)) {

				error = -EPERM;

				goto done;

			}

#ifdef CONFIG_COMPAT

			/* WTF? I don't even want to _think_ about making this

			   work for 32-bit userspace. TBH I don't really want

			   to think about it at all. dwmw2. */

			if (compat) {

				if (net_ratelimit())

					printk(KERN_WARNING "32-bit task cannot be atmsigd\n");

				error = -EINVAL;

				goto done;

			}

#endif

			error = sigd_attach(vcc);

			if (!error)

				sock->state = SS_CONNECTED;
@@ -155,8 +179,21 @@ int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) 
	if (error != -ENOIOCTLCMD)

		goto done;



	error = atm_dev_ioctl(cmd, argp);

	error = atm_dev_ioctl(cmd, argp, compat);



done:

	return error;

}





int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	return do_vcc_ioctl(sock, cmd, arg, 0);

}



#ifdef CONFIG_COMPAT

int vcc_compat_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)

{

	return do_vcc_ioctl(sock, cmd, arg, 1);

}

#endif

net/atm/pvc.c

+3 −0
Original line number Diff line number Diff line
@@ -113,6 +113,9 @@ static const struct proto_ops pvc_proto_ops = { 
	.getname =	pvc_getname,

	.poll =		vcc_poll,

	.ioctl =	vcc_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl = vcc_compat_ioctl,

#endif

	.listen =	sock_no_listen,

	.shutdown =	pvc_shutdown,

	.setsockopt =	pvc_setsockopt,