mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

Kbuild fixes for v5.6

Browse source 
- fix memory corruption in scripts/kallsyms
 
  - fix the vmlinux link stage to correctly update compile.h
 -----BEGIN PGP SIGNATURE-----
 
 iQJJBAABCgAzFiEEbmPs18K1szRHjPqEPYsBB53g2wYFAl5EH2wVHG1hc2FoaXJv
 eUBrZXJuZWwub3JnAAoJED2LAQed4NsGX/UP/0j/U3FxvLba8Ke/hIObdfZQyuhp
 kxvhq4+Mgylx9JQ84nME5HlFpoW83qyvLQGcEnj5yErMiYfOX62h8TPVKjMg5tvu
 w5Wik777pc0bAbrwBCzmO19rDzWX7TH/Gg0HrmgsZFNynF/mlFXVYtCJ0cIgmzxH
 zI9W/UpZX9Mns7gzdn0kig50KoidcdgH3W78KApCBrMK75KC3E4qSWumm11ToCGe
 Yh4n/TsqWhsMdJpnZRYIZq144bOHGvTqj62fgR3UgOIp4fgYEQZ1Eh/phMFu3YXm
 63nr5tx7lsRIb1RrFg9rljktEUAB9I9Nia9+Dpp8lDGnifciZFnyZm6mee0c8RzE
 NMD3FMjp+jSE9LfahdkrunPepI1vlsS0XQbRlSOTu26lEZiYOHiYZomE2Z1Jt5bf
 ancQJUMoQ2rRWAN816r1p2+CiRn/kRI0vWtxJmQylHx5AIN9Gaw6bF1/b67C3jVn
 QNrS7i0nsVZ45tUuzVDxwUMtsqRzS892Me0WvEua2vd53623qiVQnLeyIACdg40X
 HzgF8Q3EChyjR5248x7C4q0Vr3srwUIgHcPHM3I64dmCXAVGOH1G62V7s1BqZ3w7
 74xKy8RsCmpmODOvMSUMajBqouXR9LtXe+vcoECMjksvRbv5DQYHjM52lmBHROYq
 Qg/98qM7Lhr9MH0E
 =4lc5
 -----END PGP SIGNATURE-----

Merge tag 'kbuild-fixes-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild fixes from Masahiro Yamada:

 - fix memory corruption in scripts/kallsyms

 - fix the vmlinux link stage to correctly update compile.h

* tag 'kbuild-fixes-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kbuild: fix mismatch between .version and include/generated/compile.h
  scripts/kallsyms: fix memory corruption caused by write over-run
This commit is contained in:
Linus Torvalds 2020-02-12 10:28:42 -08:00
commit f2850dd5ee
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/kallsyms.c
View file

@ -210,7 +210,7 @@ static struct sym_entry *read_symbol(FILE *in)
len = strlen(name) + 1;
sym = malloc(sizeof(*sym) + len);
sym = malloc(sizeof(*sym) + len + 1);
if (!sym) {
fprintf(stderr, "kallsyms failure: "
"unable to allocate required amount of memory\n");
@ -219,7 +219,7 @@ static struct sym_entry *read_symbol(FILE *in)
sym->addr = addr;
sym->len = len;
sym->sym[0] = type;
memcpy(sym_name(sym), name, len);
strcpy(sym_name(sym), name);
sym->percpu_absolute = 0;
return sym;

2
scripts/link-vmlinux.sh
View file

@ -239,7 +239,7 @@ else
fi;
# final build of init/
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init
${MAKE} -f "${srctree}/scripts/Makefile.build" obj=init need-builtin=1
#link vmlinux.o
info LD vmlinux.o