diff options
| author | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-11-22 15:32:08 +0100 |
| commit | cceb9bd63373061ad7b75c321808a2fb11c86545 (patch) | |
| tree | a70d939eabed2e19538707402441644dfc26990e /arch/x86/lib/csum-wrappers_64.c | |
| parent | percpu: Convert remaining __get_cpu_var uses in 3.18-rcX (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-cceb9bd63373061ad7b75c321808a2fb11c86545.tar.xz linux-cceb9bd63373061ad7b75c321808a2fb11c86545.zip | |
Merge branch 'master' into for-3.19
Pull in to receive 54ef6df3f3f1 ("rcu: Provide counterpart to
rcu_dereference() for non-RCU situations").
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/x86/lib/csum-wrappers_64.c')
| -rw-r--r-- | arch/x86/lib/csum-wrappers_64.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c index 7609e0e421ec..1318f75d56e4 100644 --- a/arch/x86/lib/csum-wrappers_64.c +++ b/arch/x86/lib/csum-wrappers_64.c @@ -41,9 +41,8 @@ csum_partial_copy_from_user(const void __user *src, void *dst, while (((unsigned long)src & 6) && len >= 2) { __u16 val16; - *errp = __get_user(val16, (const __u16 __user *)src); - if (*errp) - return isum; + if (__get_user(val16, (const __u16 __user *)src)) + goto out_err; *(__u16 *)dst = val16; isum = (__force __wsum)add32_with_carry( |