Commit 77a50df2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  iwlwifi: Allow building iwl3945 without iwl4965.
  wireless: Fix compile error with wifi & leds
  tcp: Fix slab corruption with ipv6 and tcp6fuzz
  ipv4/ipv6 compat: Fix SSM applications on 64bit kernels.
  [IPSEC]: Use digest_null directly for auth
  sunrpc: fix missing kernel-doc
  can: Fix copy_from_user() results interpretation
  Revert "ipv6: Fix typo in net/ipv6/Kconfig"
  tipc: endianness annotations
  ipv6: result of csum_fold() is already 16bit, no need to cast
  [XFRM] AUDIT: Fix flowlabel text format ambibuity.
parents 96fffeb4 358c1295

drivers/net/wireless/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ obj-$(CONFIG_RTL8187) += rtl8187.o 


obj-$(CONFIG_ADM8211)	+= adm8211.o



obj-$(CONFIG_IWLCORE)	+= iwlwifi/

obj-$(CONFIG_IWLWIFI)	+= iwlwifi/

obj-$(CONFIG_RT2X00)	+= rt2x00/



obj-$(CONFIG_P54_COMMON)	+= p54/

drivers/net/wireless/iwlwifi/Kconfig

+6 −0
Original line number Diff line number Diff line 
config IWLWIFI

	bool

	default n



config IWLCORE

	tristate "Intel Wireless Wifi Core"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select IWLWIFI



config IWLWIFI_LEDS

	bool
@@ -106,6 +111,7 @@ config IWL3945 
	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select FW_LOADER

	select IWLWIFI

	---help---

	  Select to build the driver supporting the:

include/net/compat.h

+3 −0
Original line number Diff line number Diff line
@@ -40,4 +40,7 @@ extern int put_cmsg_compat(struct msghdr*, int, int, int, void *); 


extern int cmsghdr_from_user_compat_to_kern(struct msghdr *, struct sock *, unsigned char *, int);



extern int compat_mc_setsockopt(struct sock *, int, int, char __user *, int,

	int (*)(struct sock *, int, int, char __user *, int));



#endif /* NET_COMPAT_H */

net/can/raw.c

+10 −11
Original line number Diff line number Diff line
@@ -435,15 +435,13 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, 
			if (!filter)

				return -ENOMEM;



			err = copy_from_user(filter, optval, optlen);

			if (err) {

			if (copy_from_user(filter, optval, optlen)) {

				kfree(filter);

				return err;

				return -EFAULT;

			}

		} else if (count == 1) {

			err = copy_from_user(&sfilter, optval, optlen);

			if (err)

				return err;

			if (copy_from_user(&sfilter, optval, optlen))

				return -EFAULT;

		}



		lock_sock(sk);
@@ -493,9 +491,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, 
		if (optlen != sizeof(err_mask))

			return -EINVAL;



		err = copy_from_user(&err_mask, optval, optlen);

		if (err)

			return err;

		if (copy_from_user(&err_mask, optval, optlen))

			return -EFAULT;



		err_mask &= CAN_ERR_MASK;
@@ -531,7 +528,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, 
		if (optlen != sizeof(ro->loopback))

			return -EINVAL;



		err = copy_from_user(&ro->loopback, optval, optlen);

		if (copy_from_user(&ro->loopback, optval, optlen))

			return -EFAULT;



		break;
@@ -539,7 +537,8 @@ static int raw_setsockopt(struct socket *sock, int level, int optname, 
		if (optlen != sizeof(ro->recv_own_msgs))

			return -EINVAL;



		err = copy_from_user(&ro->recv_own_msgs, optval, optlen);

		if (copy_from_user(&ro->recv_own_msgs, optval, optlen))

			return -EFAULT;



		break;

net/compat.c

+117 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


#include <net/scm.h>

#include <net/sock.h>

#include <net/ip.h>

#include <net/ipv6.h>

#include <asm/uaccess.h>

#include <net/compat.h>
@@ -521,6 +523,121 @@ asmlinkage long compat_sys_getsockopt(int fd, int level, int optname, 
	}

	return err;

}



struct compat_group_req {

	__u32				 gr_interface;

	struct __kernel_sockaddr_storage gr_group

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));



struct compat_group_source_req {

	__u32				 gsr_interface;

	struct __kernel_sockaddr_storage gsr_group

		__attribute__ ((aligned(4)));

	struct __kernel_sockaddr_storage gsr_source

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));



struct compat_group_filter {

	__u32				 gf_interface;

	struct __kernel_sockaddr_storage gf_group

		__attribute__ ((aligned(4)));

	__u32				 gf_fmode;

	__u32				 gf_numsrc;

	struct __kernel_sockaddr_storage gf_slist[1]

		__attribute__ ((aligned(4)));

} __attribute__ ((packed));





int compat_mc_setsockopt(struct sock *sock, int level, int optname,

	char __user *optval, int optlen,

	int (*setsockopt)(struct sock *,int,int,char __user *,int))

{

	char __user	*koptval = optval;

	int		koptlen = optlen;



	switch (optname) {

	case MCAST_JOIN_GROUP:

	case MCAST_LEAVE_GROUP:

	{

		struct compat_group_req __user *gr32 = (void *)optval;

		struct group_req __user *kgr =

			compat_alloc_user_space(sizeof(struct group_req));

		u32 interface;



		if (!access_ok(VERIFY_READ, gr32, sizeof(*gr32)) ||

		    !access_ok(VERIFY_WRITE, kgr, sizeof(struct group_req)) ||

		    __get_user(interface, &gr32->gr_interface) ||

		    __put_user(interface, &kgr->gr_interface) ||

		    copy_in_user(&kgr->gr_group, &gr32->gr_group,

				sizeof(kgr->gr_group)))

			return -EFAULT;

		koptval = (char __user *)kgr;

		koptlen = sizeof(struct group_req);

		break;

	}

	case MCAST_JOIN_SOURCE_GROUP:

	case MCAST_LEAVE_SOURCE_GROUP:

	case MCAST_BLOCK_SOURCE:

	case MCAST_UNBLOCK_SOURCE:

	{

		struct compat_group_source_req __user *gsr32 = (void *)optval;

		struct group_source_req *kgsr = compat_alloc_user_space(

			sizeof(struct group_source_req));

		u32 interface;



		if (!access_ok(VERIFY_READ, gsr32, sizeof(*gsr32)) ||

		    !access_ok(VERIFY_WRITE, kgsr,

			sizeof(struct group_source_req)) ||

		    __get_user(interface, &gsr32->gsr_interface) ||

		    __put_user(interface, &kgsr->gsr_interface) ||

		    copy_in_user(&kgsr->gsr_group, &gsr32->gsr_group,

				sizeof(kgsr->gsr_group)) ||

		    copy_in_user(&kgsr->gsr_source, &gsr32->gsr_source,

				sizeof(kgsr->gsr_source)))

			return -EFAULT;

		koptval = (char __user *)kgsr;

		koptlen = sizeof(struct group_source_req);

		break;

	}

	case MCAST_MSFILTER:

	{

		struct compat_group_filter __user *gf32 = (void *)optval;

		struct group_filter *kgf;

		u32 interface, fmode, numsrc;



		if (!access_ok(VERIFY_READ, gf32, sizeof(*gf32)) ||

		    __get_user(interface, &gf32->gf_interface) ||

		    __get_user(fmode, &gf32->gf_fmode) ||

		    __get_user(numsrc, &gf32->gf_numsrc))

			return -EFAULT;

		koptlen = optlen + sizeof(struct group_filter) -

				sizeof(struct compat_group_filter);

		if (koptlen < GROUP_FILTER_SIZE(numsrc))

			return -EINVAL;

		kgf = compat_alloc_user_space(koptlen);

		if (!access_ok(VERIFY_WRITE, kgf, koptlen) ||

		    __put_user(interface, &kgf->gf_interface) ||

		    __put_user(fmode, &kgf->gf_fmode) ||

		    __put_user(numsrc, &kgf->gf_numsrc) ||

		    copy_in_user(&kgf->gf_group, &gf32->gf_group,

				sizeof(kgf->gf_group)) ||

		    (numsrc && copy_in_user(&kgf->gf_slist, &gf32->gf_slist,

				numsrc * sizeof(kgf->gf_slist[0]))))

			return -EFAULT;

		koptval = (char __user *)kgf;

		break;

	}



	default:

		break;

	}

	return setsockopt(sock, level, optname, koptval, koptlen);

}



EXPORT_SYMBOL(compat_mc_setsockopt);





/* Argument list sizes for compat_sys_socketcall */

#define AL(x) ((x) * sizeof(u32))

static unsigned char nas[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3),

CRA Git | Maintained and supported by SUSTech CRA and CCSE