Skip to content

Commit 8a3e4a6

Browse files
committed
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
2 parents f61a89c + 719a937 commit 8a3e4a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lib/iov_iter.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ static __noclone int copy_compat_iovec_from_user(struct iovec *iov,
13491349
return ret;
13501350
}
13511351

1352-
static int copy_iovec_from_user(struct iovec *iov,
1352+
static __noclone int copy_iovec_from_user(struct iovec *iov,
13531353
const struct iovec __user *uiov, unsigned long nr_segs)
13541354
{
13551355
int ret = -EFAULT;

tools/objtool/elf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ struct elf *elf_open_read(const char *name, int flags)
10051005
perror("malloc");
10061006
return NULL;
10071007
}
1008-
memset(elf, 0, offsetof(struct elf, sections));
1008+
memset(elf, 0, sizeof(*elf));
10091009

10101010
INIT_LIST_HEAD(&elf->sections);
10111011

0 commit comments

Comments
 (0)