Commit b66973b8 authored by Luis Chamberlain's avatar Luis Chamberlain
Browse files

module: move get_modinfo() helpers all above 



Instead of forward declaring routines for get_modinfo() just move
everything up. This makes no functional changes.

Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 3c17655a

kernel/module/main.c

+48 −52
Original line number Diff line number Diff line
@@ -1016,9 +1016,55 @@ int try_to_force_load(struct module *mod, const char *reason) 
#endif

}



static char *get_modinfo(const struct load_info *info, const char *tag);

/* Parse tag=value strings from .modinfo section */

static char *next_string(char *string, unsigned long *secsize)

{

	/* Skip non-zero chars */

	while (string[0]) {

		string++;

		if ((*secsize)-- <= 1)

			return NULL;

	}



	/* Skip any zero padding. */

	while (!string[0]) {

		string++;

		if ((*secsize)-- <= 1)

			return NULL;

	}

	return string;

}



static char *get_next_modinfo(const struct load_info *info, const char *tag,

			      char *prev);

			      char *prev)

{

	char *p;

	unsigned int taglen = strlen(tag);

	Elf_Shdr *infosec = &info->sechdrs[info->index.info];

	unsigned long size = infosec->sh_size;



	/*

	 * get_modinfo() calls made before rewrite_section_headers()

	 * must use sh_offset, as sh_addr isn't set!

	 */

	char *modinfo = (char *)info->hdr + infosec->sh_offset;



	if (prev) {

		size -= prev - modinfo;

		modinfo = next_string(prev, &size);

	}



	for (p = modinfo; p; p = next_string(p, &size)) {

		if (strncmp(p, tag, taglen) == 0 && p[taglen] == '=')

			return p + taglen + 1;

	}

	return NULL;

}



static char *get_modinfo(const struct load_info *info, const char *tag)

{

	return get_next_modinfo(info, tag, NULL);

}



static int verify_namespace_is_imported(const struct load_info *info,

					const struct kernel_symbol *sym,
@@ -1544,56 +1590,6 @@ static void set_license(struct module *mod, const char *license) 
	}

}



/* Parse tag=value strings from .modinfo section */

static char *next_string(char *string, unsigned long *secsize)

{

	/* Skip non-zero chars */

	while (string[0]) {

		string++;

		if ((*secsize)-- <= 1)

			return NULL;

	}



	/* Skip any zero padding. */

	while (!string[0]) {

		string++;

		if ((*secsize)-- <= 1)

			return NULL;

	}

	return string;

}



static char *get_next_modinfo(const struct load_info *info, const char *tag,

			      char *prev)

{

	char *p;

	unsigned int taglen = strlen(tag);

	Elf_Shdr *infosec = &info->sechdrs[info->index.info];

	unsigned long size = infosec->sh_size;



	/*

	 * get_modinfo() calls made before rewrite_section_headers()

	 * must use sh_offset, as sh_addr isn't set!

	 */

	char *modinfo = (char *)info->hdr + infosec->sh_offset;



	if (prev) {

		size -= prev - modinfo;

		modinfo = next_string(prev, &size);

	}



	for (p = modinfo; p; p = next_string(p, &size)) {

		if (strncmp(p, tag, taglen) == 0 && p[taglen] == '=')

			return p + taglen + 1;

	}

	return NULL;

}



static char *get_modinfo(const struct load_info *info, const char *tag)

{

	return get_next_modinfo(info, tag, NULL);

}



static void setup_modinfo(struct module *mod, struct load_info *info)

{

	struct module_attribute *attr;