Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-27 21:33:05 +00:00
Code Issues Projects Releases Wiki Activity

handle GPLONLY symbols

Browse Source
This commit is contained in:
Glenn L McGrath 2003-08-30 06:00:33 +00:00
parent 29a05f56d5
commit 759515c26a
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modutils/insmod.c
View File

@ -253,7 +253,7 @@
#ifndef MODUTILS_MODULE_H #ifndef MODUTILS_MODULE_H
static const int MODUTILS_MODULE_H = 1; static const int MODUTILS_MODULE_H = 1;
#ident "$Id: insmod.c,v 1.100 2003/08/13 19:56:33 andersen Exp $" #ident "$Id: insmod.c,v 1.101 2003/08/30 06:00:33 bug1 Exp $"
/* This file contains the structures used by the 2.0 and 2.1 kernels. /* This file contains the structures used by the 2.0 and 2.1 kernels.
We do not use the kernel headers directly because we do not wish We do not use the kernel headers directly because we do not wish
@ -474,7 +474,7 @@ int delete_module(const char *);
#ifndef MODUTILS_OBJ_H #ifndef MODUTILS_OBJ_H
static const int MODUTILS_OBJ_H = 1; static const int MODUTILS_OBJ_H = 1;
#ident "$Id: insmod.c,v 1.100 2003/08/13 19:56:33 andersen Exp $" #ident "$Id: insmod.c,v 1.101 2003/08/30 06:00:33 bug1 Exp $"
/* The relocatable object is manipulated using elfin types. */ /* The relocatable object is manipulated using elfin types. */
@ -650,6 +650,8 @@ static enum obj_reloc arch_apply_relocation (struct obj_file *f,
static void arch_create_got (struct obj_file *f); static void arch_create_got (struct obj_file *f);
static int obj_gpl_license(struct obj_file *f, const char **license);
#ifdef CONFIG_FEATURE_NEW_MODULE_INTERFACE #ifdef CONFIG_FEATURE_NEW_MODULE_INTERFACE
static int arch_init_module (struct obj_file *f, struct new_module *); static int arch_init_module (struct obj_file *f, struct new_module *);
#endif #endif
@ -660,7 +662,6 @@ static int arch_init_module (struct obj_file *f, struct new_module *);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
/* SPFX is always a string, so it can be concatenated to string constants. */ /* SPFX is always a string, so it can be concatenated to string constants. */
#ifdef SYMBOL_PREFIX #ifdef SYMBOL_PREFIX
#define SPFX SYMBOL_PREFIX #define SPFX SYMBOL_PREFIX
@ -1927,11 +1928,14 @@ add_symbols_from(
struct new_module_symbol *s; struct new_module_symbol *s;
size_t i; size_t i;
int used = 0; int used = 0;
int gpl;
#ifdef SYMBOL_PREFIX #ifdef SYMBOL_PREFIX
char *name_buf = 0; char *name_buf = 0;
size_t name_alloced_size = 0; size_t name_alloced_size = 0;
#endif #endif
gpl = obj_gpl_license(f, NULL) == 0;
for (i = 0, s = syms; i < nsyms; ++i, ++s) { for (i = 0, s = syms; i < nsyms; ++i, ++s) {
/* Only add symbols that are already marked external. /* Only add symbols that are already marked external.
If we override locals we may cause problems for If we override locals we may cause problems for
@ -1940,6 +1944,19 @@ add_symbols_from(
struct obj_symbol *sym; struct obj_symbol *sym;
char *name = (char *)s->name; char *name = (char *)s->name;
/* GPL licensed modules can use symbols exported with
* EXPORT_SYMBOL_GPL, so ignore any GPLONLY_ prefix on the
* exported names. Non-GPL modules never see any GPLONLY_
* symbols so they cannot fudge it by adding the prefix on
* their references.
*/
if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
if (gpl)
((char *)s->name) += 8;
else
continue;
}
#ifdef SYMBOL_PREFIX #ifdef SYMBOL_PREFIX
/* Prepend SYMBOL_PREFIX to the symbol's name (the /* Prepend SYMBOL_PREFIX to the symbol's name (the
kernel exports `C names', but module object files kernel exports `C names', but module object files
@ -3612,6 +3629,7 @@ static void hide_special_symbols(struct obj_file *f)
ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info)); ELFW(ST_INFO) (STB_LOCAL, ELFW(ST_TYPE) (sym->info));
} }
#ifdef CONFIG_FEATURE_CHECK_TAINTED_MODULE #ifdef CONFIG_FEATURE_CHECK_TAINTED_MODULE
static int obj_gpl_license(struct obj_file *f, const char **license) static int obj_gpl_license(struct obj_file *f, const char **license)
{ {