linux-kernel - Re: [PATCH 07/13] jump label v8: sort jump table at build-time

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 20 May 2010 16:17:29 -0400
From:	Jason Baron <jbaron@...hat.com>
To:	David Miller <davem@...emloft.net>
Cc:	linux-kernel@...r.kernel.org, mingo@...e.hu,
	mathieu.desnoyers@...ymtl.ca, hpa@...or.com, tglx@...utronix.de,
	rostedt@...dmis.org, andi@...stfloor.org, roland@...hat.com,
	rth@...hat.com, mhiramat@...hat.com, fweisbec@...il.com,
	avi@...hat.com, vgoyal@...hat.com
Subject: Re: [PATCH 07/13] jump label v8: sort jump table at build-time

On Wed, May 19, 2010 at 03:36:34PM -0700, David Miller wrote:
> > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
> > index 2092361..fe6f8be 100644
> > --- a/scripts/mod/modpost.c
> > +++ b/scripts/mod/modpost.c
> > @@ -17,6 +17,8 @@
> >  #include "modpost.h"
> >  #include "../../include/generated/autoconf.h"
> >  #include "../../include/linux/license.h"
> > +#include <linux/types.h>
> > +#include "jump_entry.h"
> >  
> 
> This breaks the build on non-jump_label-supporting architectures
> because only they will have the jump_entry.h header file.
> 
> I'm really getting tired trying to test your changes and every single
> time as I go through doing very basic build testing I always hit one
> patch that assumes jump label support exists, or assumes some x86'ism.

sorry about that. I mis-tested it. anyways here's the interdiff to this
patch to fix. btw, how do the sparc bits look?

thanks,

-Jason


diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index fe6f8be..cc87012 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -18,7 +18,9 @@
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
 #include <linux/types.h>
-#include "jump_entry.h"
+#ifdef CONFIG_HAVE_ARCH_JUMP_LABEL
+ #include "jump_entry.h"
+#endif
 
 /* Some toolchains use a `_' prefix for all user symbols. */
 #ifdef CONFIG_SYMBOL_PREFIX
@@ -377,6 +379,8 @@ void release_file(void *file, unsigned long size)
 	munmap(file, size);
 }
 
+#ifdef CONFIG_HAVE_ARCH_JUMP_LABEL
+
 static void swap_jump_label_entries(struct jump_entry *previous, struct jump_entry *next)
 {
 	struct jump_entry tmp;
@@ -421,6 +425,8 @@ static void sort_jump_label_table(struct elf_info *info, Elf_Ehdr *hdr)
 	} while (swapped == 1);
 }
 
+#endif
+
 static int parse_elf(struct elf_info *info, const char *filename)
 {
 	unsigned int i;
@@ -539,8 +545,10 @@ static int parse_elf(struct elf_info *info, const char *filename)
 		sym->st_size  = TO_NATIVE(sym->st_size);
 	}
 
+#ifdef CONFIG_HAVE_ARCH_JUMP_LABEL
 	if (enable_jump_label)
 		sort_jump_label_table(info, hdr);
+#endif
 
 	return 1;
 }
--
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/