Skip to content

Commit 8d4abca

Browse files
media: ngene: Fix out-of-bounds bug in ngene_command_config_free_buf()
Fix an 11-year old bug in ngene_command_config_free_buf() while addressing the following warnings caught with -Warray-bounds: arch/alpha/include/asm/string.h:22:16: warning: '__builtin_memcpy' offset [12, 16] from the object at 'com' is out of the bounds of referenced subobject 'config' with type 'unsigned char' at offset 10 [-Warray-bounds] arch/x86/include/asm/string_32.h:182:25: warning: '__builtin_memcpy' offset [12, 16] from the object at 'com' is out of the bounds of referenced subobject 'config' with type 'unsigned char' at offset 10 [-Warray-bounds] The problem is that the original code is trying to copy 6 bytes of data into a one-byte size member _config_ of the wrong structue FW_CONFIGURE_BUFFERS, in a single call to memcpy(). This causes a legitimate compiler warning because memcpy() overruns the length of &com.cmd.ConfigureBuffers.config. It seems that the right structure is FW_CONFIGURE_FREE_BUFFERS, instead, because it contains 6 more members apart from the header _hdr_. Also, the name of the function ngene_command_config_free_buf() suggests that the actual intention is to ConfigureFreeBuffers, instead of ConfigureBuffers (which takes place in the function ngene_command_config_buf(), above). Fix this by enclosing those 6 members of struct FW_CONFIGURE_FREE_BUFFERS into new struct config, and use &com.cmd.ConfigureFreeBuffers.config as the destination address, instead of &com.cmd.ConfigureBuffers.config, when calling memcpy(). This also helps with the ongoing efforts to globally enable -Warray-bounds and get us closer to being able to tighten the FORTIFY_SOURCE routines on memcpy(). Link: KSPP#109 Fixes: dae52d0 ("V4L/DVB: ngene: Initial check-in") Cc: stable@vger.kernel.org Reported-by: kernel test robot <lkp@intel.com> Reviewed-by: Kees Cook <keescook@chromium.org> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Link: https://lore.kernel.org/linux-hardening/20210420001631.GA45456@embeddedor/
1 parent 2734d6c commit 8d4abca

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

drivers/media/pci/ngene/ngene-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ static int ngene_command_config_free_buf(struct ngene *dev, u8 *config)
385385

386386
com.cmd.hdr.Opcode = CMD_CONFIGURE_FREE_BUFFER;
387387
com.cmd.hdr.Length = 6;
388-
memcpy(&com.cmd.ConfigureBuffers.config, config, 6);
388+
memcpy(&com.cmd.ConfigureFreeBuffers.config, config, 6);
389389
com.in_len = 6;
390390
com.out_len = 0;
391391

drivers/media/pci/ngene/ngene.h

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -407,12 +407,14 @@ enum _BUFFER_CONFIGS {
407407

408408
struct FW_CONFIGURE_FREE_BUFFERS {
409409
struct FW_HEADER hdr;
410-
u8 UVI1_BufferLength;
411-
u8 UVI2_BufferLength;
412-
u8 TVO_BufferLength;
413-
u8 AUD1_BufferLength;
414-
u8 AUD2_BufferLength;
415-
u8 TVA_BufferLength;
410+
struct {
411+
u8 UVI1_BufferLength;
412+
u8 UVI2_BufferLength;
413+
u8 TVO_BufferLength;
414+
u8 AUD1_BufferLength;
415+
u8 AUD2_BufferLength;
416+
u8 TVA_BufferLength;
417+
} __packed config;
416418
} __attribute__ ((__packed__));
417419

418420
struct FW_CONFIGURE_UART {

0 commit comments

Comments
 (0)