Message ID | 20221212130748.443416-1-brgl@bgdev.pl |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2231938wrr; Mon, 12 Dec 2022 05:08:57 -0800 (PST) X-Google-Smtp-Source: AA0mqf4WXWcS1vzkbm6Yp1pjd++DbNLSxpT/NW9WWWLHzUQVvVNqQcg/lCTLSZ6gc9L7zR6TpVxM X-Received: by 2002:a17:902:8ec1:b0:188:6a62:9d89 with SMTP id x1-20020a1709028ec100b001886a629d89mr15381764plo.54.1670850537613; Mon, 12 Dec 2022 05:08:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670850537; cv=none; d=google.com; s=arc-20160816; b=HuFKFXnkCQudvvpnoS0D3h42QpxgkhQrEPSVRxHfTCy7BtU1ok68rb7iOASlJJ+bg3 ognvZJRdUbNfhO+Mmg9Izp6Hxv0jeUamb54o440vgwdSUolhcaq9HmQK8QNqTgrjvwdC TgYnIdh/wFWzES/o1qTkCG0MPfoMKRIiPD/DdjXDbfpzVRf7+fsgqFkZcVCMCYT52Aui m7sC5VUz31C8AeZD+yly7LokdVmQXQ/QU8Yqk+luPmM1i70xVhbZ5LQ+Iavvvz9bmWOp njZLiu9oenZszz4xvYIfQS9eElREwM68dH93FlHB4h86SJ9ZwKAm87giPByW9PiQ0ueP 7Kbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=M5yuV9jd97R81uDazuj6Xzn2nQRDFmr1/RjN3Yc1W2U=; b=t4+wYb+bkXm1S85PsMxiKDWJT6SJ3Dkw5Iop5Jn3VG4EYglh44W591h+cKHAkNhjvp idse4I4S28bwhDtTrvNjDSObVwSaPGg/XIIIRHBupK621pgcFA2mHIzBBU0tAMmncC4n 1bq4s0XM0LVE8RQrnc0Gi22nLobL2ysb8X2mcBqlipkc8oL0oYxRkHrw7+XzMwXAth7r zeOfv8sGuxRl6U/grbuRuWd+qGRIPyfNogB16ugYBk3eW7CGVm6l6B941Jo1a3eFKiGW 1I2v2E49N5jQ/UMoz1VFMDcc7GBnkBgToy3b8T/4nA9dpg8EKgvCY3ceetzRJifHuIcS ROBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=8COUZHtU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u17-20020a170902e5d100b0017840d9d579si10674962plf.67.2022.12.12.05.08.44; Mon, 12 Dec 2022 05:08:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20210112.gappssmtp.com header.s=20210112 header.b=8COUZHtU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231974AbiLLNID (ORCPT <rfc822;jeantsuru.cumc.mandola@gmail.com> + 99 others); Mon, 12 Dec 2022 08:08:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232052AbiLLNH6 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Mon, 12 Dec 2022 08:07:58 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE2B86458 for <linux-kernel@vger.kernel.org>; Mon, 12 Dec 2022 05:07:51 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso5081502wmo.1 for <linux-kernel@vger.kernel.org>; Mon, 12 Dec 2022 05:07:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=M5yuV9jd97R81uDazuj6Xzn2nQRDFmr1/RjN3Yc1W2U=; b=8COUZHtUWTRPsp14Y0Sk3z9fvujNJj0DQepHFAVugiJvB918gp3oHwgyBkUoWq51Qa nnYtfpFk9AoKIdNXM1cauY2lk3TIPDGUm6k+wO6Qg8YLBj1fG1/mznNTgABWRVb3slP8 Q6ceNEZiPiSCGcOtAtxOwdRag3a+gCGtYHg3WTLT0Ge9FilcFX9jzUxVLJKxCVflZVZh CVyuy9L4YC3mLOcUzVgKef8K3opHmRcadQBaLzDMkYo8SfhjpLCWSclju2SeWm4jjGLA QyO0+lT2v5K/vTNjJX5g9zZwghp2pv7RwbG27An9hyFd+enSXqo+zMUfEUmdqVgFrtf/ L3dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M5yuV9jd97R81uDazuj6Xzn2nQRDFmr1/RjN3Yc1W2U=; b=byScq026doWcmdY8RkukcMLFuMMALnGEzid3HtvhR5wOR3/bRbpzFcoFuDsSZHDhuK kyP3MLDXzyVIY3qe0KQxHWQYVd2Yix5RKnydNHQKiY5sLewYPGYxB/149ClzFZQ4YaLU SYv9bOVqafyr5gzbOkoRpwlaNzheavFJlwyq2FiOd6GWaWvwPkLPxJ5PvLRlTm80KQIh I3SNXcM8Nc1ogdZC1TIdai9rlMjOrUKmKoSspca8JQ+q0rmEk78Bp/UwdkGCR6FwfAcx BsR8UfmboH6Ex6VWgkr2lL3sVojo0Q0LPOldtvNQOeoXB589TiWNwFwWGbyc/Mv5eToe /UFw== X-Gm-Message-State: ANoB5pmqDdoY8KC3L90WONOJ7BGR9T/ZTPq2PqU+ioLZ6/Y/SCzuj+Pg gZP1pQYmbmeyu5Eje4EZhGneVw== X-Received: by 2002:a05:600c:908:b0:3d1:fb5d:dd67 with SMTP id m8-20020a05600c090800b003d1fb5ddd67mr12039182wmp.23.1670850470397; Mon, 12 Dec 2022 05:07:50 -0800 (PST) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:8f39:2597:6684:1762]) by smtp.gmail.com with ESMTPSA id i2-20020a1c5402000000b003c6c182bef9sm11220360wmb.36.2022.12.12.05.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Dec 2022 05:07:49 -0800 (PST) From: Bartosz Golaszewski <brgl@bgdev.pl> To: Kent Gibson <warthog618@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski <bartosz.golaszewski@linaro.org>, kernel test robot <oliver.sang@intel.com> Subject: [PATCH] gpio: sim: set a limit on the number of GPIOs Date: Mon, 12 Dec 2022 14:07:48 +0100 Message-Id: <20221212130748.443416-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752013773489088151?= X-GMAIL-MSGID: =?utf-8?q?1752013773489088151?= |
Series |
gpio: sim: set a limit on the number of GPIOs
|
|
Commit Message
Bartosz Golaszewski
Dec. 12, 2022, 1:07 p.m. UTC
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> With the removal of ARCH_NR_GPIOS in commit 7b61212f2a07 ("gpiolib: Get rid of ARCH_NR_GPIOS") the gpiolib core no longer sanitizes the number of GPIOs for us. This causes the gpio-sim selftests to now fail when setting the number of GPIOs to 99999 and expecting the probe() to fail. Set a sane limit of 1024 on the number of simulated GPIOs and bail out of probe if it's exceeded. Reported-by: kernel test robot <oliver.sang@intel.com> Link: https://lore.kernel.org/oe-lkp/202212112236.756f5db9-oliver.sang@intel.com Fixes: 7b61212f2a07 ("gpiolib: Get rid of ARCH_NR_GPIOS") Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> --- drivers/gpio/gpio-sim.c | 4 ++++ 1 file changed, 4 insertions(+)
Comments
On Mon, Dec 12, 2022 at 2:07 PM Bartosz Golaszewski <brgl@bgdev.pl> wrote: > > From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > > With the removal of ARCH_NR_GPIOS in commit 7b61212f2a07 ("gpiolib: Get > rid of ARCH_NR_GPIOS") the gpiolib core no longer sanitizes the number > of GPIOs for us. This causes the gpio-sim selftests to now fail when > setting the number of GPIOs to 99999 and expecting the probe() to fail. > > Set a sane limit of 1024 on the number of simulated GPIOs and bail out > of probe if it's exceeded. > > Reported-by: kernel test robot <oliver.sang@intel.com> > Link: https://lore.kernel.org/oe-lkp/202212112236.756f5db9-oliver.sang@intel.com > Fixes: 7b61212f2a07 ("gpiolib: Get rid of ARCH_NR_GPIOS") > Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> > --- > drivers/gpio/gpio-sim.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c > index 1020c2feb249..60514bc5454f 100644 > --- a/drivers/gpio/gpio-sim.c > +++ b/drivers/gpio/gpio-sim.c > @@ -31,6 +31,7 @@ > > #include "gpiolib.h" > > +#define GPIO_SIM_NGPIO_MAX 1024 > #define GPIO_SIM_PROP_MAX 4 /* Max 3 properties + sentinel. */ > #define GPIO_SIM_NUM_ATTRS 3 /* value, pull and sentinel */ > > @@ -371,6 +372,9 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev) > if (ret) > return ret; > > + if (num_lines > GPIO_SIM_NGPIO_MAX) > + return -ERANGE; > + > ret = fwnode_property_read_string(swnode, "gpio-sim,label", &label); > if (ret) { > label = devm_kasprintf(dev, GFP_KERNEL, "%s-%s", > -- > 2.37.2 > Applied this, as it needs to go into the big PR for this merge window. Bart
diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c index 1020c2feb249..60514bc5454f 100644 --- a/drivers/gpio/gpio-sim.c +++ b/drivers/gpio/gpio-sim.c @@ -31,6 +31,7 @@ #include "gpiolib.h" +#define GPIO_SIM_NGPIO_MAX 1024 #define GPIO_SIM_PROP_MAX 4 /* Max 3 properties + sentinel. */ #define GPIO_SIM_NUM_ATTRS 3 /* value, pull and sentinel */ @@ -371,6 +372,9 @@ static int gpio_sim_add_bank(struct fwnode_handle *swnode, struct device *dev) if (ret) return ret; + if (num_lines > GPIO_SIM_NGPIO_MAX) + return -ERANGE; + ret = fwnode_property_read_string(swnode, "gpio-sim,label", &label); if (ret) { label = devm_kasprintf(dev, GFP_KERNEL, "%s-%s",