lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 6 Jun 2012 09:04:49 -0700 From: tip-bot for Arun Sharma <asharma@...com> To: linux-tip-commits@...r.kernel.org Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org, a.p.zijlstra@...llo.nl, torvalds@...ux-foundation.org, tglx@...utronix.de, asharma@...com Subject: [tip:perf/core] perf/x86: Check user address explicitly in copy_from_user_nmi() Commit-ID: db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 Gitweb: http://git.kernel.org/tip/db0dc75d6403b6663c0eab4c6ccb672eb9b2ed72 Author: Arun Sharma <asharma@...com> AuthorDate: Fri, 20 Apr 2012 15:41:36 -0700 Committer: Ingo Molnar <mingo@...nel.org> CommitDate: Wed, 6 Jun 2012 17:08:04 +0200 perf/x86: Check user address explicitly in copy_from_user_nmi() Signed-off-by: Arun Sharma <asharma@...com> Cc: Linus Torvalds <torvalds@...ux-foundation.org> Cc: linux-kernel@...r.kernel.org Signed-off-by: Peter Zijlstra <a.p.zijlstra@...llo.nl> Link: http://lkml.kernel.org/r/1334961696-19580-5-git-send-email-asharma@fb.com Signed-off-by: Ingo Molnar <mingo@...nel.org> --- arch/x86/lib/usercopy.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/x86/lib/usercopy.c b/arch/x86/lib/usercopy.c index f61ee67..677b1ed 100644 --- a/arch/x86/lib/usercopy.c +++ b/arch/x86/lib/usercopy.c @@ -8,6 +8,7 @@ #include <linux/module.h> #include <asm/word-at-a-time.h> +#include <linux/sched.h> /* * best effort, GUP based copy_from_user() that is NMI-safe @@ -21,6 +22,9 @@ copy_from_user_nmi(void *to, const void __user *from, unsigned long n) void *map; int ret; + if (__range_not_ok(from, n, TASK_SIZE) == 0) + return len; + do { ret = __get_user_pages_fast(addr, 1, 0, &page); if (!ret) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists