d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trivial reduction of the code duplication, reuse the return FALSE code.

Browse Source 
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
This commit is contained in:
Konstantin Belousov 2018-11-23 23:16:01 +00:00
parent 96fdfb3649
commit eda8fe63c9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=340862
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/imgact_elf.c
View File

@ -2364,8 +2364,7 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Brandnote *checknote,
curthread->td_ucred, NOCRED, NULL, curthread);
if (error != 0) {
uprintf("i/o error PT_NOTE\n");
res = FALSE;
goto ret;
goto retf;
}
note = note0 = (const Elf_Note *)buf;
note_end = (const Elf_Note *)(buf + pnote->p_filesz);
@ -2379,8 +2378,7 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Brandnote *checknote,
for (i = 0; i < 100 && note >= note0 && note < note_end; i++) {
if (!aligned(note, Elf32_Addr) || (const char *)note_end -
(const char *)note < sizeof(Elf_Note)) {
res = FALSE;
goto ret;
goto retf;
}
if (note->n_namesz != checknote->hdr.n_namesz ||
note->n_descsz != checknote->hdr.n_descsz ||
@ -2408,6 +2406,7 @@ __elfN(parse_notes)(struct image_params *imgp, Elf_Brandnote *checknote,
roundup2(note->n_namesz, ELF_NOTE_ROUNDSIZE) +
roundup2(note->n_descsz, ELF_NOTE_ROUNDSIZE));
}
retf:
res = FALSE;
ret:
free(buf, M_TEMP);