Merge tag 'objtool_urgent_for_v6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull objtool fixes from Borislav Petkov:

 - Mark copy_iovec_from_user() __noclone in order to prevent gcc from
   doing an inter-procedural optimization and confuse objtool

 - Initialize struct elf fully to avoid build failures

* tag 'objtool_urgent_for_v6.5_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  iov_iter: Mark copy_iovec_from_user() noclone
  objtool: initialize all of struct elf
This commit is contained in:
Linus Torvalds
2023-07-16 13:34:29 -07:00
2 changed files with 2 additions and 2 deletions

View File

@ -1349,7 +1349,7 @@ uaccess_end:
return ret;
}
static int copy_iovec_from_user(struct iovec *iov,
static __noclone int copy_iovec_from_user(struct iovec *iov,
const struct iovec __user *uiov, unsigned long nr_segs)
{
int ret = -EFAULT;

View File

@ -1005,7 +1005,7 @@ struct elf *elf_open_read(const char *name, int flags)
perror("malloc");
return NULL;
}
memset(elf, 0, offsetof(struct elf, sections));
memset(elf, 0, sizeof(*elf));
INIT_LIST_HEAD(&elf->sections);