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

Commit d1052aa5 authored by Wim de With's avatar Wim de With Committed by Greg Kroah-Hartman
Browse files

staging: gdm72xx: add userspace data struct 



This fixes the sparse warnings about dereferencing a userspace pointer.

Once I updated the sparse annotations, I noticed a bug in
gdm_wimax_ioctl() where we pass a user space pointer to gdm_update_fsm()
which dereferences it. I fixed this.

Signed-off-by: default avatarWim de With <nauxuron@wimdewith.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bc29a1a

drivers/staging/gdm72xx/gdm_wimax.c

+8 −4
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ static void kdelete(void **buf) 
	}

}



static int gdm_wimax_ioctl_get_data(struct data_s *dst, struct data_s *src)

static int gdm_wimax_ioctl_get_data(struct udata_s *dst, struct data_s *src)

{

	int size;
@@ -379,7 +379,7 @@ static int gdm_wimax_ioctl_get_data(struct data_s *dst, struct data_s *src) 
	return 0;

}



static int gdm_wimax_ioctl_set_data(struct data_s *dst, struct data_s *src)

static int gdm_wimax_ioctl_set_data(struct data_s *dst, struct udata_s *src)

{

	if (!src->size) {

		dst->size = 0;
@@ -455,6 +455,7 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	struct wm_req_s *req = (struct wm_req_s *)ifr;

	struct nic *nic = netdev_priv(dev);

	int ret;

	struct fsm_s fsm_buf;



	if (cmd != SIOCWMIOCTL)

		return -EOPNOTSUPP;
@@ -477,8 +478,11 @@ static int gdm_wimax_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
				/* NOTE: gdm_update_fsm should be called

				 * before gdm_wimax_ioctl_set_data is called.

				 */

				gdm_update_fsm(dev,

					       req->data.buf);

				if (copy_from_user(&fsm_buf, req->data.buf,

						   sizeof(struct fsm_s)))

					return -EFAULT;



				gdm_update_fsm(dev, &fsm_buf);

			}

			ret = gdm_wimax_ioctl_set_data(

				&nic->sdk_data[req->data_id], &req->data);

drivers/staging/gdm72xx/wm_ioctl.h

+6 −1
Original line number Diff line number Diff line
@@ -78,13 +78,18 @@ struct data_s { 
	void	*buf;

};



struct udata_s {

	int		size;

	void __user	*buf;

};



struct wm_req_s {

	union {

		char ifrn_name[IFNAMSIZ];

	} ifr_ifrn;

	unsigned short	cmd;

	unsigned short	data_id;

	struct data_s	data;

	struct udata_s	data;



/* NOTE: sizeof(struct wm_req_s) must be less than sizeof(struct ifreq). */

};