Commit 5565a3ca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

compat_ioctl: move isdn/capi ioctl translation into driver 



Neither the old isdn4linux interface nor the newer mISDN stack
ever had working 32-bit compat mode as far as I can tell.

However, the CAPI stack has some ioctl commands that are
correctly listed in fs/compat_ioctl.c.

We can trivially move all of those into the corresponding
file that implement the native handlers by adding a compat_ioctl
redirect to that.

I did notice that treating CAPI_MANUFACTURER_CMD() as compatible
is broken, so I'm also adding a handler for that, realizing that
in all likelyhood, nobody is ever going to call it.

Cc: Karsten Keil <isdn@linux-pingi.de>
Cc: netdev@vger.kernel.org
Cc: isdn4linux@listserv.isdn4linux.de
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0ba9841a

drivers/isdn/capi/capi.c

+31 −0
Original line number Diff line number Diff line
@@ -950,6 +950,34 @@ capi_unlocked_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	return ret;

}



#ifdef CONFIG_COMPAT

static long

capi_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)

{

	int ret;



	if (cmd == CAPI_MANUFACTURER_CMD) {

		struct {

			compat_ulong_t cmd;

			compat_uptr_t data;

		} mcmd32;



		if (!capable(CAP_SYS_ADMIN))

			return -EPERM;

		if (copy_from_user(&mcmd32, compat_ptr(arg), sizeof(mcmd32)))

			return -EFAULT;



		mutex_lock(&capi_mutex);

		ret = capi20_manufacturer(mcmd32.cmd, compat_ptr(mcmd32.data));

		mutex_unlock(&capi_mutex);



		return ret;

	}



	return capi_unlocked_ioctl(file, cmd, (unsigned long)compat_ptr(arg));

}

#endif



static int capi_open(struct inode *inode, struct file *file)

{

	struct capidev *cdev;
@@ -996,6 +1024,9 @@ static const struct file_operations capi_fops = 
	.write		= capi_write,

	.poll		= capi_poll,

	.unlocked_ioctl	= capi_unlocked_ioctl,

#ifdef CONFIG_COMPAT

	.compat_ioctl	= capi_compat_ioctl,

#endif

	.open		= capi_open,

	.release	= capi_release,

};

fs/compat_ioctl.c

+0 −17
Original line number Diff line number Diff line
@@ -44,9 +44,6 @@ 
#include <net/bluetooth/hci_sock.h>

#include <net/bluetooth/rfcomm.h>



#include <linux/capi.h>

#include <linux/gigaset_dev.h>



#ifdef CONFIG_BLOCK

#include <linux/cdrom.h>

#include <linux/fd.h>
@@ -681,20 +678,6 @@ COMPATIBLE_IOCTL(RFCOMMRELEASEDEV) 
COMPATIBLE_IOCTL(RFCOMMGETDEVLIST)

COMPATIBLE_IOCTL(RFCOMMGETDEVINFO)

COMPATIBLE_IOCTL(RFCOMMSTEALDLC)

/* CAPI */

COMPATIBLE_IOCTL(CAPI_REGISTER)

COMPATIBLE_IOCTL(CAPI_GET_MANUFACTURER)

COMPATIBLE_IOCTL(CAPI_GET_VERSION)

COMPATIBLE_IOCTL(CAPI_GET_SERIAL)

COMPATIBLE_IOCTL(CAPI_GET_PROFILE)

COMPATIBLE_IOCTL(CAPI_MANUFACTURER_CMD)

COMPATIBLE_IOCTL(CAPI_GET_ERRCODE)

COMPATIBLE_IOCTL(CAPI_INSTALLED)

COMPATIBLE_IOCTL(CAPI_GET_FLAGS)

COMPATIBLE_IOCTL(CAPI_SET_FLAGS)

COMPATIBLE_IOCTL(CAPI_CLR_FLAGS)

COMPATIBLE_IOCTL(CAPI_NCCI_OPENCOUNT)

COMPATIBLE_IOCTL(CAPI_NCCI_GETUNIT)

/* Misc. */

COMPATIBLE_IOCTL(PCIIOC_CONTROLLER)

COMPATIBLE_IOCTL(PCIIOC_MMAP_IS_IO)

CRA Git | Maintained and supported by SUSTech CRA and CCSE