Commit ba7d4f36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull compat_ioctl fixes from Al Viro:
 "A bunch of compat_ioctl fixes, mostly in bluetooth.

  Hopefully, most of fs/compat_ioctl.c will get killed off over the next
  few cycles; between this, tty series already merged and Arnd's work
  this cycle ought to take a good chunk out of the damn thing..."

* 'work.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  hidp: fix compat_ioctl
  hidp: constify hidp_connection_add()
  cmtp: fix compat_ioctl
  bnep: fix compat_ioctl
  compat_ioctl: trim the pointless includes
parents 5947a64a 702ec307

fs/compat_ioctl.c

+1 −68
Original line number Diff line number Diff line
@@ -22,37 +22,21 @@ 
#include <linux/smp.h>

#include <linux/ioctl.h>

#include <linux/if.h>

#include <linux/if_bridge.h>

#include <linux/raid/md_u.h>

#include <linux/kd.h>

#include <linux/route.h>

#include <linux/in6.h>

#include <linux/ipv6_route.h>

#include <linux/skbuff.h>

#include <linux/netlink.h>

#include <linux/vt.h>

#include <linux/falloc.h>

#include <linux/fs.h>

#include <linux/file.h>

#include <linux/ppp_defs.h>

#include <linux/ppp-ioctl.h>

#include <linux/if_pppox.h>

#include <linux/mtio.h>

#include <linux/tty.h>

#include <linux/vt_kern.h>

#include <linux/fb.h>

#include <linux/videodev2.h>

#include <linux/netdevice.h>

#include <linux/raw.h>

#include <linux/blkdev.h>

#include <linux/elevator.h>

#include <linux/rtc.h>

#include <linux/pci.h>

#include <linux/serial.h>

#include <linux/if_tun.h>

#include <linux/ctype.h>

#include <linux/syscalls.h>

#include <linux/atalk.h>

#include <linux/gfp.h>

#include <linux/cec.h>
@@ -74,32 +58,9 @@ 
#endif



#include <linux/uaccess.h>

#include <linux/ethtool.h>

#include <linux/mii.h>

#include <linux/if_bonding.h>

#include <linux/watchdog.h>



#include <linux/soundcard.h>

#include <linux/lp.h>

#include <linux/ppdev.h>



#include <linux/atm.h>

#include <linux/atmarp.h>

#include <linux/atmclip.h>

#include <linux/atmdev.h>

#include <linux/atmioc.h>

#include <linux/atmlec.h>

#include <linux/atmmpc.h>

#include <linux/atmsvc.h>

#include <linux/atm_tcp.h>

#include <linux/sonet.h>

#include <linux/atm_suni.h>



#include <linux/usb.h>

#include <linux/usbdevice_fs.h>

#include <linux/nbd.h>

#include <linux/random.h>

#include <linux/filter.h>



#include <linux/hiddev.h>
@@ -112,6 +73,7 @@ 
#include <linux/sort.h>



#ifdef CONFIG_SPARC

#include <linux/fb.h>

#include <asm/fbio.h>

#endif
@@ -544,22 +506,6 @@ static int mt_ioctl_trans(struct file *file, 
#define HCIUARTSETFLAGS		_IOW('U', 203, int)

#define HCIUARTGETFLAGS		_IOR('U', 204, int)



#define BNEPCONNADD	_IOW('B', 200, int)

#define BNEPCONNDEL	_IOW('B', 201, int)

#define BNEPGETCONNLIST	_IOR('B', 210, int)

#define BNEPGETCONNINFO	_IOR('B', 211, int)

#define BNEPGETSUPPFEAT	_IOR('B', 212, int)



#define CMTPCONNADD	_IOW('C', 200, int)

#define CMTPCONNDEL	_IOW('C', 201, int)

#define CMTPGETCONNLIST	_IOR('C', 210, int)

#define CMTPGETCONNINFO	_IOR('C', 211, int)



#define HIDPCONNADD	_IOW('H', 200, int)

#define HIDPCONNDEL	_IOW('H', 201, int)

#define HIDPGETCONNLIST	_IOR('H', 210, int)

#define HIDPGETCONNINFO	_IOR('H', 211, int)



#define RTC_IRQP_READ32		_IOR('p', 0x0b, compat_ulong_t)

#define RTC_IRQP_SET32		_IOW('p', 0x0c, compat_ulong_t)

#define RTC_EPOCH_READ32	_IOR('p', 0x0d, compat_ulong_t)
@@ -974,19 +920,6 @@ COMPATIBLE_IOCTL(RFCOMMRELEASEDEV) 
COMPATIBLE_IOCTL(RFCOMMGETDEVLIST)

COMPATIBLE_IOCTL(RFCOMMGETDEVINFO)

COMPATIBLE_IOCTL(RFCOMMSTEALDLC)

COMPATIBLE_IOCTL(BNEPCONNADD)

COMPATIBLE_IOCTL(BNEPCONNDEL)

COMPATIBLE_IOCTL(BNEPGETCONNLIST)

COMPATIBLE_IOCTL(BNEPGETCONNINFO)

COMPATIBLE_IOCTL(BNEPGETSUPPFEAT)

COMPATIBLE_IOCTL(CMTPCONNADD)

COMPATIBLE_IOCTL(CMTPCONNDEL)

COMPATIBLE_IOCTL(CMTPGETCONNLIST)

COMPATIBLE_IOCTL(CMTPGETCONNINFO)

COMPATIBLE_IOCTL(HIDPCONNADD)

COMPATIBLE_IOCTL(HIDPCONNDEL)

COMPATIBLE_IOCTL(HIDPGETCONNLIST)

COMPATIBLE_IOCTL(HIDPGETCONNINFO)

/* CAPI */

COMPATIBLE_IOCTL(CAPI_REGISTER)

COMPATIBLE_IOCTL(CAPI_GET_MANUFACTURER)

net/bluetooth/bnep/sock.c

+12 −7
Original line number Diff line number Diff line
@@ -49,18 +49,17 @@ static int bnep_sock_release(struct socket *sock) 
	return 0;

}



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

static int do_bnep_sock_ioctl(struct socket *sock, unsigned int cmd, void __user *argp)

{

	struct bnep_connlist_req cl;

	struct bnep_connadd_req  ca;

	struct bnep_conndel_req  cd;

	struct bnep_conninfo ci;

	struct socket *nsock;

	void __user *argp = (void __user *)arg;

	__u32 supp_feat = BIT(BNEP_SETUP_RESPONSE);

	int err;



	BT_DBG("cmd %x arg %lx", cmd, arg);

	BT_DBG("cmd %x arg %p", cmd, argp);



	switch (cmd) {

	case BNEPCONNADD:
@@ -134,16 +133,22 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
	return 0;

}



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

{

	return do_bnep_sock_ioctl(sock, cmd, (void __user *)arg);

}



#ifdef CONFIG_COMPAT

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

{

	void __user *argp = compat_ptr(arg);

	if (cmd == BNEPGETCONNLIST) {

		struct bnep_connlist_req cl;

		unsigned __user *p = argp;

		u32 uci;

		int err;



		if (get_user(cl.cnum, (u32 __user *) arg) ||

				get_user(uci, (u32 __user *) (arg + 4)))

		if (get_user(cl.cnum, p) || get_user(uci, p + 1))

			return -EFAULT;



		cl.ci = compat_ptr(uci);
@@ -153,13 +158,13 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 


		err = bnep_get_connlist(&cl);



		if (!err && put_user(cl.cnum, (u32 __user *) arg))

		if (!err && put_user(cl.cnum, p))

			err = -EFAULT;



		return err;

	}



	return bnep_sock_ioctl(sock, cmd, arg);

	return do_bnep_sock_ioctl(sock, cmd, argp);

}

#endif

net/bluetooth/cmtp/sock.c

+12 −7
Original line number Diff line number Diff line
@@ -63,17 +63,16 @@ static int cmtp_sock_release(struct socket *sock) 
	return 0;

}



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

static int do_cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, void __user *argp)

{

	struct cmtp_connadd_req ca;

	struct cmtp_conndel_req cd;

	struct cmtp_connlist_req cl;

	struct cmtp_conninfo ci;

	struct socket *nsock;

	void __user *argp = (void __user *)arg;

	int err;



	BT_DBG("cmd %x arg %lx", cmd, arg);

	BT_DBG("cmd %x arg %p", cmd, argp);



	switch (cmd) {

	case CMTPCONNADD:
@@ -137,16 +136,22 @@ static int cmtp_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long 
	return -EINVAL;

}



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

{

	return do_cmtp_sock_ioctl(sock, cmd, (void __user *)arg);

}



#ifdef CONFIG_COMPAT

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

{

	void __user *argp = compat_ptr(arg);

	if (cmd == CMTPGETCONNLIST) {

		struct cmtp_connlist_req cl;

		u32 __user *p = argp;

		u32 uci;

		int err;



		if (get_user(cl.cnum, (u32 __user *) arg) ||

				get_user(uci, (u32 __user *) (arg + 4)))

		if (get_user(cl.cnum, p) || get_user(uci, p + 1))

			return -EFAULT;



		cl.ci = compat_ptr(uci);
@@ -156,13 +161,13 @@ static int cmtp_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne 


		err = cmtp_get_connlist(&cl);



		if (!err && put_user(cl.cnum, (u32 __user *) arg))

		if (!err && put_user(cl.cnum, p))

			err = -EFAULT;



		return err;

	}



	return cmtp_sock_ioctl(sock, cmd, arg);

	return do_cmtp_sock_ioctl(sock, cmd, argp);

}

#endif

net/bluetooth/hidp/core.c

+5 −5
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ static void hidp_process_transmit(struct hidp_session *session, 
}



static int hidp_setup_input(struct hidp_session *session,

				struct hidp_connadd_req *req)

				const struct hidp_connadd_req *req)

{

	struct input_dev *input;

	int i;
@@ -748,7 +748,7 @@ EXPORT_SYMBOL_GPL(hidp_hid_driver); 
/* This function sets up the hid device. It does not add it

   to the HID system. That is done in hidp_add_connection(). */

static int hidp_setup_hid(struct hidp_session *session,

				struct hidp_connadd_req *req)

				const struct hidp_connadd_req *req)

{

	struct hid_device *hid;

	int err;
@@ -807,7 +807,7 @@ fault: 


/* initialize session devices */

static int hidp_session_dev_init(struct hidp_session *session,

				 struct hidp_connadd_req *req)

				 const struct hidp_connadd_req *req)

{

	int ret;
@@ -906,7 +906,7 @@ static void hidp_session_dev_work(struct work_struct *work) 
static int hidp_session_new(struct hidp_session **out, const bdaddr_t *bdaddr,

			    struct socket *ctrl_sock,

			    struct socket *intr_sock,

			    struct hidp_connadd_req *req,

			    const struct hidp_connadd_req *req,

			    struct l2cap_conn *conn)

{

	struct hidp_session *session;
@@ -1338,7 +1338,7 @@ static int hidp_verify_sockets(struct socket *ctrl_sock, 
	return 0;

}



int hidp_connection_add(struct hidp_connadd_req *req,

int hidp_connection_add(const struct hidp_connadd_req *req,

			struct socket *ctrl_sock,

			struct socket *intr_sock)

{

net/bluetooth/hidp/hidp.h

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct hidp_connlist_req { 
	struct hidp_conninfo __user *ci;

};



int hidp_connection_add(struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);

int hidp_connection_add(const struct hidp_connadd_req *req, struct socket *ctrl_sock, struct socket *intr_sock);

int hidp_connection_del(struct hidp_conndel_req *req);

int hidp_get_connlist(struct hidp_connlist_req *req);

int hidp_get_conninfo(struct hidp_conninfo *ci);

CRA Git | Maintained and supported by SUSTech CRA and CCSE