summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-27 15:35:55 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:52:15 -0800
commit466bf8f200f6586eff838566e6e40dbc448dd8e4 (patch)
tree48855e3ee117a4b620b04be56ac9516950384516
parentce25e35ebeaa56e566acbd1739a7c371ad5cd0c1 (diff)
downloadlinux-stable-466bf8f200f6586eff838566e6e40dbc448dd8e4.tar.gz
linux-stable-466bf8f200f6586eff838566e6e40dbc448dd8e4.tar.bz2
linux-stable-466bf8f200f6586eff838566e6e40dbc448dd8e4.zip
ray_cs: Fix copy_from_user handling
commit 575c9ed7798218dc923f319c0d78f0c25ca506b9 upstream. I've not touched the other stuff here but the word "locking" comes to mind. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/net/wireless/ray_cs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 963960dc30f2..eef4e8678237 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2758,7 +2758,7 @@ static void raycs_write(const char *name, write_proc_t *w, void *data)
static int write_essid(struct file *file, const char __user *buffer, unsigned long count, void *data)
{
static char proc_essid[33];
- int len = count;
+ unsigned int len = count;
if (len > 32)
len = 32;