Merge with upstream (Fix bug #68283: fileinfo: out-of-bounds read in elf note headers)