From patchwork Mon Sep 18 14:55:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 141448 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2741764vqi; Mon, 18 Sep 2023 08:24:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGkaLo8p+emN1Pgwt2qF5jdvcCj8iczirBc0zUHs73eYevfNWdLF1hHOwpTMSy3aEfzn251 X-Received: by 2002:a05:6a00:4c05:b0:68f:c8b4:1a2b with SMTP id ea5-20020a056a004c0500b0068fc8b41a2bmr15538827pfb.17.1695050688150; Mon, 18 Sep 2023 08:24:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695050688; cv=none; d=google.com; s=arc-20160816; b=zFjQhbUPNkqM5A5u8kooqhIFfME4ijIBNdsy76HtDYbE37jaOy+28jX8ONpMVEfiHa 1U0F9PTtts1j1dhdM6WZc75lWSwKO90COS1d4vvLz4KZ7/vQFDrQ8jypbwjd43AFBmUw rRnMcoQr4b8cvvXyJn/3sVvTY4pmFMocSUJgTSFEZdFQ6qR+4p3OiXR7pi/Fcimyby8y ns6St99z+XnrHpCUhnMggLpraPD5eAFajkbI2CcTJtLRDTg7cdE0aESabmVQc3uE1nZ6 LBESZQuKRq0wz23zSlxsAXnhdPqGNstERkwHmqMs5YB/41IdqOicsJRBLwYWl9m4h52l 29bQ== 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=G+kdSJ4sQ1S01UdF8CEB51WLv93rf0qpn38b7uekeAw=; fh=lCwMbqetBpO0Vd7a3gKFArRnLB2AASuTMycQRzK1uok=; b=Zsf8dwBc3ihLJtf5LYOEVWn3Aa8o+xl38KrnRwVqifO5FZjXhnfc/1zgIdWsUruQ0W /Ys5ucNNJ7PX0EEaxE5iRODAKPwFditxqc+WtUAnFAwtGJL90oz2EnIGf/0EjxsB8aqm YVJ9ABnuhlCjASoSXhns2j6T8WhtGrySLje6LYkjbb2CgIsVVQmNduXYujiGuJLkpRza XeeXBwYznSRk+8CWWa0wPz7FLMJoUh/NPevGrqigzVWOjqEFwAiqkWB56t7alR/xx5Qm Re1VHYnUFciVyUu5iqw/8Nz0aeimsgyMYjBG07QqOkmv+Mz1E2yK8g4wcFntjVMEubwh voRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ZC8yjZqd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id br14-20020a056a00440e00b0068e4debbe12si8017289pfb.371.2023.09.18.08.24.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 08:24:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20230601.gappssmtp.com header.s=20230601 header.b=ZC8yjZqd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 6E0DA80FDDE3; Mon, 18 Sep 2023 08:24:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240982AbjIRPYh (ORCPT + 27 others); Mon, 18 Sep 2023 11:24:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239986AbjIRPYf (ORCPT ); Mon, 18 Sep 2023 11:24:35 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DF3411992 for ; Mon, 18 Sep 2023 08:21:43 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-5310aec4121so1576225a12.2 for ; Mon, 18 Sep 2023 08:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1695050476; x=1695655276; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=G+kdSJ4sQ1S01UdF8CEB51WLv93rf0qpn38b7uekeAw=; b=ZC8yjZqdh5fa1uyOULW90//iZVc6cI8y6UDlt09RsVDy+MCJ4ADv4XRjf7+rVB7vBE UtFQpsxEeNzQUDTwOdqXFEZYJ/XVfimQGWCbp6tewQp6g63A1mj3flZTtEN0MNQy9Voa jnPp+xZ32G0t2m1ScYtM/53M4IXjbPTplAL8uLBJaKMBFhuRjS+YauaIHeBJEp74xzT6 1bDDV3YmCwSQZ/OumNtQFQlzML541VtSuylNx/sZCOHQHba2xCkeiuWFQCBxy9XPq5y5 qxoGsfNLNjTTQuuXLZqMkOxqvWs/lrGcJ6Xx9WrbF73mcqT6rAO9Wo9cPuDqDo/Pdw/K xltw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695050476; x=1695655276; 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=G+kdSJ4sQ1S01UdF8CEB51WLv93rf0qpn38b7uekeAw=; b=biAqOUPWyGilhh4vPCBwFgahGndw17CnqV5tY+eRq0HAbqc1wO2TzcIkDoaku61wY1 cuP5lM9RJnsd51Mjgt8VAh8Bl8VcYhTBBlfW1uw1VPdiJQpR6uoYibT6ygD57mQiU22b 9xXdVnOSaBPO9VoQCMRo56CS8MsC7TZjaozSl5VZ4KLq9dqFTR28zNosdQuRevRqnJMA KCiwlIRw+3xrl0PErhCtjXGuhcRm0Q6J/JmgkFe4cGxjfL9yQ0O+BDTV2RpskhOzhhHG 6jxCko9Zpt1U/S1suq9mp77X0NFHRRejPuMtPk9aKL/CZSWAqcxrjpnAlzYY/sVYYm6T tNcg== X-Gm-Message-State: AOJu0Yzs+kqVd7dCwKf8fWNiVzmgBg6eHQRRq0Mmg3xkObqaxwmfGWki Yplkhv/C9HtlNzKTWkS5DM/uJSN1NLGyk1A+d6U= X-Received: by 2002:adf:d208:0:b0:320:4d1:d5f3 with SMTP id j8-20020adfd208000000b0032004d1d5f3mr5306035wrh.6.1695048938243; Mon, 18 Sep 2023 07:55:38 -0700 (PDT) Received: from brgl-uxlite.nice.aeroport.fr ([193.57.185.11]) by smtp.gmail.com with ESMTPSA id y14-20020a5d4ace000000b0031c5dda3aedsm12995208wrs.95.2023.09.18.07.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 07:55:37 -0700 (PDT) From: Bartosz Golaszewski To: Linus Walleij , Andy Shevchenko , Kent Gibson , Alexey Dobriyan , Peter Zijlstra , Linus Torvalds , akpm@linux-foundation.org Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH v4] gpio: sim: fix an invalid __free() usage Date: Mon, 18 Sep 2023 16:55:33 +0200 Message-Id: <20230918145533.14642-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 18 Sep 2023 08:24:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777389470376761044 X-GMAIL-MSGID: 1777389470376761044 From: Bartosz Golaszewski gpio_sim_make_line_names() returns NULL or ERR_PTR() so we must not use __free(kfree) on the returned address. Split this function into two, one that determines the size of the "gpio-line-names" array to allocate and one that actually sets the names at correct offsets. The allocation and assignment of the managed pointer happens in between. Fixes: 3faf89f27aab ("gpio: sim: simplify code with cleanup helpers") Reported-by: Alexey Dobriyan Closes: https://lore.kernel.org/all/07c32bf1-6c1a-49d9-b97d-f0ae4a2b42ab@p183/ Suggested-by: Linus Torvalds Signed-off-by: Bartosz Golaszewski --- Linus, I followed the pattern for determining the size of the line-names array from your patch in the end but with a changed variable naming. If this is fine, I'll queue it for fixes for the next rc. Bart v3 -> v4: - simplify the line counting logic v2 -> v3: - restore the offset out-of-bounds checks v1 -> v2: - split the line name setting into two parts drivers/gpio/gpio-sim.c | 59 +++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 37 deletions(-) diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c index 460389bb8e3f..b66abb55ef4d 100644 --- a/drivers/gpio/gpio-sim.c +++ b/drivers/gpio/gpio-sim.c @@ -718,52 +718,32 @@ gpio_sim_device_config_live_show(struct config_item *item, char *page) return sprintf(page, "%c\n", live ? '1' : '0'); } -static char **gpio_sim_make_line_names(struct gpio_sim_bank *bank, - unsigned int *line_names_size) +static unsigned int gpio_sim_get_line_names_size(struct gpio_sim_bank *bank) { - unsigned int max_offset = 0; - bool has_line_names = false; struct gpio_sim_line *line; - char **line_names; + unsigned int size = 0; list_for_each_entry(line, &bank->line_list, siblings) { - if (line->offset >= bank->num_lines) + if (!line->name || (line->offset >= bank->num_lines)) continue; - if (line->name) { - if (line->offset > max_offset) - max_offset = line->offset; - - /* - * max_offset can stay at 0 so it's not an indicator - * of whether line names were configured at all. - */ - has_line_names = true; - } + size = line->offset + 1; } - if (!has_line_names) - /* - * This is not an error - NULL means, there are no line - * names configured. - */ - return NULL; - - *line_names_size = max_offset + 1; + return size; +} - line_names = kcalloc(*line_names_size, sizeof(*line_names), GFP_KERNEL); - if (!line_names) - return ERR_PTR(-ENOMEM); +static void +gpio_sim_set_line_names(struct gpio_sim_bank *bank, char **line_names) +{ + struct gpio_sim_line *line; list_for_each_entry(line, &bank->line_list, siblings) { - if (line->offset >= bank->num_lines) + if (!line->name || (line->offset >= bank->num_lines)) continue; - if (line->name && (line->offset <= max_offset)) - line_names[line->offset] = line->name; + line_names[line->offset] = line->name; } - - return line_names; } static void gpio_sim_remove_hogs(struct gpio_sim_device *dev) @@ -867,7 +847,7 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank, struct fwnode_handle *parent) { struct property_entry properties[GPIO_SIM_PROP_MAX]; - unsigned int prop_idx = 0, line_names_size = 0; + unsigned int prop_idx = 0, line_names_size; char **line_names __free(kfree) = NULL; memset(properties, 0, sizeof(properties)); @@ -878,14 +858,19 @@ gpio_sim_make_bank_swnode(struct gpio_sim_bank *bank, properties[prop_idx++] = PROPERTY_ENTRY_STRING("gpio-sim,label", bank->label); - line_names = gpio_sim_make_line_names(bank, &line_names_size); - if (IS_ERR(line_names)) - return ERR_CAST(line_names); + line_names_size = gpio_sim_get_line_names_size(bank); + if (line_names_size) { + line_names = kcalloc(line_names_size, sizeof(*line_names), + GFP_KERNEL); + if (!line_names) + return ERR_PTR(-ENOMEM); + + gpio_sim_set_line_names(bank, line_names); - if (line_names) properties[prop_idx++] = PROPERTY_ENTRY_STRING_ARRAY_LEN( "gpio-line-names", line_names, line_names_size); + } return fwnode_create_software_node(properties, parent); }