]> git.dujemihanovic.xyz Git - u-boot.git/commit
fru: ops: avoid out of bounds access
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Sun, 3 Jan 2021 17:07:53 +0000 (18:07 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Tue, 5 Jan 2021 10:54:53 +0000 (11:54 +0100)
commitb6d14c52f91b57367e7bd8499c963b74fb74b41e
tree9eb54307708e727cb05ff587a608b5186022009d
parent389b45d6b05784c0043bac859666b98a5f704402
fru: ops: avoid out of bounds access

Building xilinx_zynq_virt_defconfig fails on origin/next as reported by
GCC 10.2 (as provided by Debian Bullseye):

  CC      board/xilinx/common/fru_ops.o
board/xilinx/common/fru_ops.c: In function ‘fru_capture’:
board/xilinx/common/fru_ops.c:173:8:
error: array subscript 284 is outside array bounds of
‘struct fru_table[1]’ [-Werror=array-bounds]
  173 |  limit = data + sizeof(struct fru_board_data);
      |  ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
board/xilinx/common/fru_ops.c:17:18: note: while referencing ‘fru_data’
   17 | struct fru_table fru_data __section(.data);
      |                  ^~~~~~~~

When using sizeof(struct fru_board_data) to find the end of the structure
you should add it to the start of the structure.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
board/xilinx/common/fru_ops.c