From 4337ea19d016ed06ab3679592e25e11ea99bc4dd Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Fri, 9 Apr 2010 23:47:31 +0000
Subject: [PATCH] --- yaml --- r: 189865 b: refs/heads/master c:
 4ffa87012efd7b664762b579213d4663560ef4a3 h: refs/heads/master i:   189863:
 cc0ac0f520d8f899f909ad19cca7b0123f8350ef v: v3

---
 [refs]              | 2 +-
 trunk/net/can/raw.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cbf158377001..f75db6c36c8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dac876193cd79ced36d0462749ea47c05844fb49
+refs/heads/master: 4ffa87012efd7b664762b579213d4663560ef4a3
diff --git a/trunk/net/can/raw.c b/trunk/net/can/raw.c
index 3a7dffb6519c..da99cf153b33 100644
--- a/trunk/net/can/raw.c
+++ b/trunk/net/can/raw.c
@@ -445,7 +445,7 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
 				return -EFAULT;
 			}
 		} else if (count == 1) {
-			if (copy_from_user(&sfilter, optval, optlen))
+			if (copy_from_user(&sfilter, optval, sizeof(sfilter)))
 				return -EFAULT;
 		}