]> git.baikalelectronics.ru Git - kernel.git/commit
s390/crashdump: fix TOD programmable field size
authorHeiko Carstens <hca@linux.ibm.com>
Fri, 18 Nov 2022 12:05:39 +0000 (13:05 +0100)
committerAlexander Gordeev <agordeev@linux.ibm.com>
Thu, 24 Nov 2022 12:45:05 +0000 (13:45 +0100)
commit0435c450d16674f909c8e507c8cfa2f52802e782
tree33938b3e4bda9ee1f3e815fe4821e530e6b41e6b
parent04dc5e736ce8302a6f79027ff7999752c16339b2
s390/crashdump: fix TOD programmable field size

The size of the TOD programmable field was incorrectly increased from
four to eight bytes with commit 6ac8c3d942dd ("s390/dump: cleanup CPU
save area handling").
This leads to an elf notes section NT_S390_TODPREG which has a size of
eight instead of four bytes in case of kdump, however even worse is
that the contents is incorrect: it is supposed to contain only the
contents of the TOD programmable field, but in fact contains a mix of
the TOD programmable field (32 bit upper bits) and parts of the CPU
timer register (lower 32 bits).

Fix this by simply changing the size of the todpreg field within the
save area structure. This will implicitly also fix the size of the
corresponding elf notes sections.

This also gets rid of this compile time warning:

in function ‘fortify_memcpy_chk’,
    inlined from ‘save_area_add_regs’ at arch/s390/kernel/crash_dump.c:99:2:
./include/linux/fortify-string.h:413:25: error: call to ‘__read_overflow2_field’
   declared with attribute warning: detected read beyond size of field
   (2nd parameter); maybe use struct_group()? [-Werror=attribute-warning]
  413 |                         __read_overflow2_field(q_size_field, size);
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: 6ac8c3d942dd ("s390/dump: cleanup CPU save area handling")
Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
arch/s390/kernel/crash_dump.c