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: Mon, 5 Mar 2018 19:25:03 -0500 From: Pavel Tatashin <pasha.tatashin@...cle.com> To: steven.sistare@...cle.com, daniel.m.jordan@...cle.com, linux-kernel@...r.kernel.org, Alexander.Levin@...rosoft.com, dan.j.williams@...el.com, sathyanarayanan.kuppuswamy@...el.com, pankaj.laxminarayan.bharadiya@...el.com, akuster@...sta.com, cminyard@...sta.com, pasha.tatashin@...cle.com, gregkh@...uxfoundation.org, stable@...r.kernel.org Subject: [PATCH 4.1 30/65] kaiser: fix build and FIXME in alloc_ldt_struct() From: Hugh Dickins <hughd@...gle.com> Include linux/kaiser.h instead of asm/kaiser.h to build ldt.c without CONFIG_KAISER. kaiser_add_mapping() does already return an error code, so fix the FIXME. Signed-off-by: Hugh Dickins <hughd@...gle.com> Acked-by: Jiri Kosina <jkosina@...e.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org> (cherry picked from commit 9b94cf97f42ca30fe9b5010900fa6e1d6855a9f6) Signed-off-by: Pavel Tatashin <pasha.tatashin@...cle.com> --- arch/x86/kernel/ldt.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c index 9c6ebaf0a83b..c388247e0353 100644 --- a/arch/x86/kernel/ldt.c +++ b/arch/x86/kernel/ldt.c @@ -48,7 +48,7 @@ static struct ldt_struct *alloc_ldt_struct(int size) { struct ldt_struct *new_ldt; int alloc_size; - int ret = 0; + int ret; if (size > LDT_ENTRIES) return NULL; @@ -76,10 +76,8 @@ static struct ldt_struct *alloc_ldt_struct(int size) return NULL; } - // FIXME: make kaiser_add_mapping() return an error code - // when it fails - kaiser_add_mapping((unsigned long)new_ldt->entries, alloc_size, - __PAGE_KERNEL); + ret = kaiser_add_mapping((unsigned long)new_ldt->entries, alloc_size, + __PAGE_KERNEL); if (ret) { __free_ldt_struct(new_ldt); return NULL; -- 2.16.2
Powered by blists - more mailing lists