Fixes for IEEE 802.15.4
Subsystems (3)
Hi, David,
Please pull both into net/master and net-next/master (as I'd like to submit few patches into net-next/master depending on this).
The following changes since commit 4e36a95e591e9c58dd10bb4103c00993917c27fd:
David Howells (1):
RxRPC: Use uX/sX rather than uintX_t/intX_t types
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git for-linus
Dmitry Eremin-Solenikov (2):
af_ieee802154: setsockopt optlen arg isn't __user
ieee802154: add locking for seq numbers
net/ieee802154/dgram.c | 2 +- net/ieee802154/netlink.c | 4 ++++ net/ieee802154/raw.c | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-)
PATCH 1/2 af_ieee802154: setsockopt optlen arg isn't __user
Remove __user annotation from optlen arg as it's bogus.
--- net/ieee802154/dgram.c | 2 +- net/ieee802154/raw.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
net/ieee802154/dgram.c +1 -1
@@ -414,7 +414,7 @@ static int dgram_getsockopt(struct sock *sk, int level, int optname, }static int dgram_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user optlen) +char __user *optval,int optlen) {struct dgram_sock *ro =dgram_sk (sk);int val;
net/ieee802154/raw.c +1 -1
@@ -244,7 +244,7 @@ static int raw_getsockopt(struct sock *sk, int level, int optname, }static int raw_setsockopt (struct sock *sk,int level,int optname, -char __user *optval,int __user optlen) +char __user *optval,int optlen) {return -EOPNOTSUPP ; }
Signature · 1 line
1.6.3.3
PATCH 2/2 ieee802154: add locking for seq numbers
--- net/ieee802154/netlink.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
net/ieee802154/netlink.c +4 -0
@@ -35,6 +35,7 @@#include <net/ieee802154_netdev.h> static unsigned int ieee802154_seq_num; +static DEFINE_SPINLOCK (ieee802154_seq_lock);static struct genl_family ieee802154_coordinator_family = { .id =GENL_ID_GENERATE ,
@@ -57,12 +58,15 @@ static struct sk_buff *ieee802154_nl_create(int flags, u8 req) {void *hdr;struct sk_buff *msg =nlmsg_new (NLMSG_GOODSIZE ,GFP_ATOMIC ); +unsigned long f;if (!msg)return NULL ; +spin_lock_irqsave (&ieee802154_seq_lock, f); hdr =genlmsg_put (msg,0 , ieee802154_seq_num++, &ieee802154_coordinator_family, flags, req); +spin_unlock_irqrestore (&ieee802154_seq_lock, f);if (!hdr) {nlmsg_free (msg);return NULL ;
Signature · 1 line
1.6.3.3
David Miller
maintainerFrom: Dmitry Eremin-Solenikov <[email protected]>
Date: Wed, 16 Sep 2009 17:22:11 +0400
Quoted 5 lines
Hi, David,
Please pull both into net/master and net-next/master (as I'd like to submit few patches into net-next/master depending on this).
Quoted 7 lines
The following changes since commit
4e36a95e591e9c58dd10bb4103c00993917c27fd:
David Howells (1):
RxRPC: Use uX/sX rather than uintX_t/intX_t typesare available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.gitfor-linus
Pulled thanks.