s390 updates for 5.4-rc5
Subsystems (2)
Vasily Gorbik
maintainerHello Linus,
please pull s390 changes for 5.4-rc5.
Thank you,
Vasily
The following changes since commit 7d194c2100ad2a6dded545887d02754948ca5241:
Linux 5.4-rc4 (2019-10-20 15:56:22 -0400)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.4-5
for you to fetch changes up to ac49303d9ef0ad98b79867a380ef23480e48870b:
s390/kaslr: add support for R_390_GLOB_DAT relocation type (2019-10-22 17:55:51 +0200)
----------------------------------------------------------------
s390 updates for 5.4-rc5
- Add R_390_GLOB_DAT relocation type support. This fixes boot problem on linux-next.
- Fix memory leak in zcrypt.
----------------------------------------------------------------
Gerald Schaefer (1):
s390/kaslr: add support for R_390_GLOB_DAT relocation type
Johan Hovold (1):
s390/zcrypt: fix memleak at release
arch/s390/boot/startup.c | 14 +++++++++++--- arch/s390/kernel/machine_kexec_reloc.c | 1 + drivers/s390/crypto/zcrypt_api.c | 3 +-- 3 files changed, 13 insertions(+), 5 deletions(-)
arch/s390/boot/startup.c +11 -3
@@ -101,10 +101,18 @@ static void handle_relocs(unsigned long offset) dynsym = (Elf64_Sym *) vmlinux.dynsym_start;for (rela = rela_start; rela < rela_end; rela++) { loc = rela->r_offset + offset; - val = rela->r_addend + offset; + val = rela->r_addend; r_sym =ELF64_R_SYM (rela->r_info); -if (r_sym) - val += dynsym[r_sym].st_value; +if (r_sym) { +if (dynsym[r_sym].st_shndx !=SHN_UNDEF ) + val += dynsym[r_sym].st_value + offset; + }else { +/* +* 0 == undefined symbol table index (STN_UNDEF), +* used for R_390_RELATIVE, only add KASLR offset +*/ + val += offset; + } r_type =ELF64_R_TYPE (rela->r_info); rc =arch_kexec_do_relocs (r_type, (void *) loc, val,0 );if (rc)
arch/s390/kernel/machine_kexec_reloc.c +1 -0
@@ -27,6 +27,7 @@ int arch_kexec_do_relocs(int r_type, void *loc, unsigned long val, *(u32 *)loc = val;break ;case R_390_64 :/* Direct 64 bit. */ +case R_390_GLOB_DAT : *(u64 *)loc = val;break ;case R_390_PC16 :/* PC relative 16 bit. */
drivers/s390/crypto/zcrypt_api.c +1 -2
@@ -522,8 +522,7 @@ static int zcrypt_release(struct inode *inode, struct file *filp)if (filp->f_inode->i_cdev == &zcrypt_cdev) {struct zcdn_device *zcdndev; -if (mutex_lock_interruptible (&ap_perms_mutex)) -return -ERESTARTSYS ; +mutex_lock (&ap_perms_mutex); zcdndev =find_zcdndev_by_devt (filp->f_inode->i_rdev);mutex_unlock (&ap_perms_mutex);if (zcdndev) {
The pull request you sent on Sat, 26 Oct 2019 12:14:58 +0200:
The pull request you sent on Sat, 26 Oct 2019 12:14:58 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.4-5
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/f877bee5ea0b56c39cd0a243e113a577b5a4ef92
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker