Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754107AbdC2HbV (ORCPT ); Wed, 29 Mar 2017 03:31:21 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:34760 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753691AbdC2HbT (ORCPT ); Wed, 29 Mar 2017 03:31:19 -0400 Date: Wed, 29 Mar 2017 00:31:15 -0700 From: Dmitry Torokhov To: Arnd Bergmann Cc: Robin van der Gracht , Miguel Ojeda Sandonis , Greg Kroah-Hartman , Rob Herring , Linus Walleij , linux-kernel@vger.kernel.org Subject: Re: [PATCH] auxdisplay: ht16k33: don't access uninitialized data Message-ID: <20170329073115.GF38261@dtor-ws> References: <20170328101203.4121922-1-arnd@arndb.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170328101203.4121922-1-arnd@arndb.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2005 Lines: 54 On Tue, Mar 28, 2017 at 12:11:49PM +0200, Arnd Bergmann wrote: > gcc-7.0.1 points out that we copy uninitialized data from the stack > into a per-device structure: > > drivers/auxdisplay/ht16k33.c: In function 'ht16k33_keypad_irq_thread': > arch/x86/include/asm/string_32.h:78:16: error: 'new_state' may be used uninitialized in this function [-Werror=maybe-uninitialized] > arch/x86/include/asm/string_32.h:79:22: error: '*((void *)&new_state+4)' may be used uninitialized in this function [-Werror=maybe-uninitialized] > > The access is harmless because we never read the data, but we are better > off not doing this, so this changes the code to only copy the data > that was actually initialized. To make sure we don't overflow the > stack with an incorrect DT, we also need to add a sanity checkin the > probe function. > > Signed-off-by: Arnd Bergmann Reviewed-by: Dmitry Torokhov > --- > drivers/auxdisplay/ht16k33.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/auxdisplay/ht16k33.c b/drivers/auxdisplay/ht16k33.c > index f66b45b235b0..ba6370974574 100644 > --- a/drivers/auxdisplay/ht16k33.c > +++ b/drivers/auxdisplay/ht16k33.c > @@ -278,7 +278,7 @@ static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad) > } > } > input_sync(keypad->dev); > - memcpy(keypad->last_key_state, new_state, sizeof(new_state)); > + memcpy(keypad->last_key_state, new_state, sizeof(u16) * keypad->cols); > > return pressed; > } > @@ -353,6 +353,12 @@ static int ht16k33_keypad_probe(struct i2c_client *client, > err = matrix_keypad_parse_of_params(&client->dev, &rows, &cols); > if (err) > return err; > + if (rows > HT16K33_MATRIX_KEYPAD_MAX_ROWS || > + cols > HT16K33_MATRIX_KEYPAD_MAX_COLS) { > + dev_err(&client->dev, "%u rows or %u cols out of range in DT\n", > + rows, cols); > + return -ERANGE; > + } > > keypad->rows = rows; > keypad->cols = cols; > -- > 2.9.0 > -- Dmitry