Commit 5d3bcb34 authored by Jiri Olsa's avatar Jiri Olsa Committed by Wen Zhiwei
Browse files

lib/buildid: Fix build ID parsing logic 

stable inclusion
from stable-v6.6.63
commit efb258ec337f34962606620fe0f77808edf9f92d
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBI1RP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=efb258ec337f34962606620fe0f77808edf9f92d



--------------------------------

The parse_build_id_buf does not account Elf32_Nhdr header size
when getting the build id data pointer and returns wrong build
id data as result.

This is problem only for stable trees that merged c83a80d8b84f
fix, the upstream build id code was refactored and returns proper
build id.

Acked-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Fixes: c83a80d8b84f ("lib/buildid: harden build ID parsing logic")
Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 2846d3ae

lib/buildid.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static int parse_build_id_buf(unsigned char *build_id, 
		    name_sz == note_name_sz &&

		    memcmp(nhdr + 1, note_name, note_name_sz) == 0 &&

		    desc_sz > 0 && desc_sz <= BUILD_ID_SIZE_MAX) {

			data = note_start + note_off + ALIGN(note_name_sz, 4);

			data = note_start + note_off + sizeof(Elf32_Nhdr) + ALIGN(note_name_sz, 4);

			memcpy(build_id, data, desc_sz);

			memset(build_id + desc_sz, 0, BUILD_ID_SIZE_MAX - desc_sz);

			if (size)