From patchwork Mon Apr 9 21:07:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 896420 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40KjYX3vmHz9rxp for ; Tue, 10 Apr 2018 07:07:28 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754706AbeDIVH1 (ORCPT ); Mon, 9 Apr 2018 17:07:27 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:42817 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752432AbeDIVH0 (ORCPT ); Mon, 9 Apr 2018 17:07:26 -0400 Received: by mail-pf0-f196.google.com with SMTP id o16so6429713pfk.9 for ; Mon, 09 Apr 2018 14:07:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+qQJUVs3iNILz8Wjx4uqhYEnePzSmf/kBge1FKloxw4=; b=bUjMMBefDYlztsr7gmYQBh0ziyC3PUX2gfU0u38DZ+J7Aim+Ltt58V8RXFn+ZAPoG1 rV1lIYUF71lzInk3kCNMu3nJhE6sxFrcDn+3BYaAyYukkiMirE5WOyAamNHhDFXwTnD3 Kr4uf+EW4mxcXYaSwY7ZMHIQARqRaV+etFIWgGvDoT48GFrIVuM2PdqKakU5+JJq9ym9 79/cknL4ho212GEoRVjjBchODlgRVdOKTU2ltrW9T2ENV/IJgTXBjM7Io3rYK7+Uuqyu 1j3YeZoHEsT2OXBq7qCtVy8ymo+PzcDPvC2P9HI39U42H575yZ5AiyPhHTYzyW3cjFvv eOdg== X-Gm-Message-State: ALQs6tAYxuoD9fovhaIW3SpGjc/WGRKpF8jXs13hVqHVZadx2zDfo79/ lARMe4e87wXCkX3ISHJU5nAyPA== X-Google-Smtp-Source: AIpwx4+/gTesh6Ux0v+Fz7bL8d55TTngLpHwQ5DX1f7eV2V6CFLnsH8ehlK+RWpDFWEUW59NNM46pA== X-Received: by 10.98.238.3 with SMTP id e3mr428936pfi.88.1523308045805; Mon, 09 Apr 2018 14:07:25 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::1082]) by smtp.gmail.com with ESMTPSA id 186sm2201619pfe.109.2018.04.09.14.07.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Apr 2018 14:07:24 -0700 (PDT) From: Laura Abbott To: Nandor Han , Geert Uytterhoeven , Kees Cook , Linus Walleij Cc: Laura Abbott , linux-gpio@vger.kernel.org, Linux Kernel Mailing List , kernel-hardening@lists.openwall.com Subject: [PATCH] gpio: xra1403: Switch to a fixed upper bound for registers Date: Mon, 9 Apr 2018 14:07:17 -0700 Message-Id: <20180409210717.3852-1-labbott@redhat.com> X-Mailer: git-send-email 2.14.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Geert Uytterhoeven pointed out that the number of register was a fixed upper bound so there's no need to use a dynamically allocated array in place of a VLA. Use the defined upper bound. Suggested-by: Geert Uytterhoeven Signed-off-by: Laura Abbott Reviewed-by: Geert Uytterhoeven --- drivers/gpio/gpio-xra1403.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/gpio/gpio-xra1403.c b/drivers/gpio/gpio-xra1403.c index 8d4c8e99b251..8711a7907568 100644 --- a/drivers/gpio/gpio-xra1403.c +++ b/drivers/gpio/gpio-xra1403.c @@ -39,6 +39,7 @@ #define XRA_REIR 0x10 /* Input Rising Edge Interrupt Enable */ #define XRA_FEIR 0x12 /* Input Falling Edge Interrupt Enable */ #define XRA_IFR 0x14 /* Input Filter Enable/Disable */ +#define XRA_LAST 0x15 /* Bounds */ struct xra1403 { struct gpio_chip chip; @@ -50,7 +51,7 @@ static const struct regmap_config xra1403_regmap_cfg = { .pad_bits = 1, .val_bits = 8, - .max_register = XRA_IFR | 0x01, + .max_register = XRA_LAST, }; static unsigned int to_reg(unsigned int reg, unsigned int offset) @@ -126,21 +127,16 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip) { int reg; struct xra1403 *xra = gpiochip_get_data(chip); - int *value; + int value[XRA_LAST]; int i; unsigned int gcr; unsigned int gsr; - value = kmalloc_array(xra1403_regmap_cfg.max_register, sizeof(*value), - GFP_KERNEL); - if (!value) - return; - seq_puts(s, "xra reg:"); - for (reg = 0; reg <= xra1403_regmap_cfg.max_register; reg++) + for (reg = 0; reg <= XRA_LAST; reg++) seq_printf(s, " %2.2x", reg); seq_puts(s, "\n value:"); - for (reg = 0; reg < xra1403_regmap_cfg.max_register; reg++) { + for (reg = 0; reg < XRA_LAST; reg++) { regmap_read(xra->regmap, reg, &value[reg]); seq_printf(s, " %2.2x", value[reg]); } @@ -159,7 +155,6 @@ static void xra1403_dbg_show(struct seq_file *s, struct gpio_chip *chip) (gcr & BIT(i)) ? "in" : "out", (gsr & BIT(i)) ? "hi" : "lo"); } - kfree(value); } #else #define xra1403_dbg_show NULL