From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A285B3AB26E for ; Wed, 29 Jul 2026 07:54:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785311688; cv=none; b=TZ1MtZToWtbId0QClNDuCAp/GQBfBxbcpk22d5zzJWAJF7G6uUm9zP2f9T3gV6p3lX5L0K5QOfffXvjIxum0+X7r5lh7vRy8m14YxZ/i92oLD5licsnj0faFfw5myAE+xE354RgFNOjD9nX2Brn4JxUQMSdtFPzCvovPDQVPoeI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785311688; c=relaxed/simple; bh=YEuZ6gKQryE2J3Njd3WN8bxitPP6KVRTPPI06OtEYQs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Gdjui5u8x2hmWPFx2eIsXaV2eYRNxKUnQLI8/l6oYNBE2vv+2420tGETKHWpZ7aTz67kyWRApXUQHp89W1NZrx4r1zUv1g8Iyjst53U8YHZxGhCrTw5TSwULG53ONA8qWJPuBJMIkxQ7DRhpixvlo14lBXgUlle1AxrZOeqO2bY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gz12KzP9; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gz12KzP9" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c9b373d5af0so470974a12.2 for ; Wed, 29 Jul 2026 00:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785311687; x=1785916487; 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:content-type; bh=zKG+MabNpbMKXaipIherA7tQ00HJriwc14bih6ExGzc=; b=gz12KzP9KtiHibrxqy+2FVILHoL60CCvE64JrdUF3Pb8djoVYyvF74K45kbVMyM6uH uffNIq5lXLs8rvK5uw/2aS773m2YbfiP34OSeW0JxeL6/5Zw9PctAwSDcIbMReEuhLrz ODHAq0OSKpC54Sia3DXrw2a5UOHc1+Yxdt+0ohdRawcCTvO0QdLh1RFm5V81EqzSaLIa f1b/qy8x3mf+r3VRryPCOgiCd4JhFRv+7dZBo0ytRRBgCQG2KrFrn3x5NBrJ7QZQ4rAG hfQmBeMFmW99MjykKOjDUuu19fBR8qTSjQi5vk/HUWw+41KWPDsDtu2Q/bZQlpEThrQ0 kHFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785311687; x=1785916487; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=zKG+MabNpbMKXaipIherA7tQ00HJriwc14bih6ExGzc=; b=OBWFVJ+HQgaPlCEFtAYGFehXtz29J6NqdwXq82L0GmOrh0PTkjo4B6qSA6qj5BOpSY hjcXufPMNt6m5HiU5npD6awXQgV7h5dhuuyBR103EGWGVk4503iDics5MpFAgPgFHpMY +RMMnXU0bElTFws/5cSuJdug6TluTzKoSvV7g5EXuuxmcaFaPlSW9c5xx0fhNp+8IuVf gdaG7IrxvN0tFaLAnhrw8hJOPM/fG0CYONx33cCeYf4ifly8DMnJbJMg5i0KDxjksW8D U3h+MrD6awLhTl+kZrqatC/N0ktl5y04NRTu1rTh1NcIqmcleI8kGxZTFYdX9KO+hEvN F4PQ== X-Forwarded-Encrypted: i=1; AHgh+RoffP9IIpr6CVVuYVY/HDlSwuITuLEeyT7ClSoJEno3BKkxCvk74lHZwV6fHFjHpIMU7DBWBJvDuIzsorw=@vger.kernel.org X-Gm-Message-State: AOJu0YxvOS6Xl8vFSrmsOffZH8Tznxq95OoU7owvd0nSt3kKpHnapqXx nUUyMrDYK5xG6PTEPxkoK5i23z/aVkNqmD3Ye8T9BYCKaTJhFIjjFmA= X-Gm-Gg: AR+sD12mBrbfBNSWWGwSlTFcDbd+N2TWfl+BsQVPjiBchFKw0qkFnFJjq0zhng2oUsa ZFv89If+HRRVdfoL5RrXwo/dJR3Zj74yEzGk+0TnRbfusRW3rV216zQSg4DmR/sv/OQCDarufKr tCHTKKX4hd7tqZ2O+L57grW9hSbsEvT2XRkozmR7MdEVpZS8he27GsWiXuXgNV/4bcCManzEzbP IKNiPpY1Jfo0stV/BHPPZOYWO9cE68zLI0iKBt9jcH9REAy2P99yGTj83t0/4fpzeVQEFJ3doYU 4lll2SbF3Z9n1eZcT8Ew9CUIHSg4bjVMhqTdoc6x9GIVvdx2BjkfZbvF8xLmKkiKcZy21hgQXBC I0Z7mG97iAJ2Aphx7qfgPNybO4DQ1QIqWpquMrut1FMrFb0Dvi1pqC9zNTBZOSKIhOnyG/UPhmG m4o0sqUcc3LrRblABjfCbk9PnlkA0dgdyL6N8wkzJo6ZTo7bTEtAlCH8i2FETJUX2DZt846pePz YtAi7q3wzzc0pHpqPUDkKby X-Received: by 2002:a05:6a21:3417:b0:3c3:7cb2:8aee with SMTP id adf61e73a8af0-3c8ba5f7795mr6718001637.57.1785311686811; Wed, 29 Jul 2026 00:54:46 -0700 (PDT) Received: from t-rex ([2401:4900:adbd:a4c0:7d16:77af:3a35:c411]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-13e7271f010sm8030055c88.9.2026.07.29.00.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 00:54:46 -0700 (PDT) From: kr494167@gmail.com To: linusw@kernel.org Cc: Frank.Li@nxp.com, conor.dooley@microchip.com, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Surendra Singh Chouhan Subject: [PATCH v3] pinctrl: generic: free maps on pinctrl_generic_to_map() failure Date: Wed, 29 Jul 2026 13:24:37 +0530 Message-ID: <20260729075437.101025-1-kr494167@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Surendra Singh Chouhan pinctrl_generic_to_map() parses DT configuration and allocates pinctrl maps via pinctrl_utils_reserve_map(). If subsequent steps (such as pinctrl_utils_add_map_mux(), pinctrl_generic_add_group(), pinconf_generic_parse_dt_config(), or pinctrl_utils_add_map_configs()) return an error, *maps may contain partially allocated map entries. Returning the error directly without freeing *maps leaks the allocated mapping memory across all drivers that rely on pinctrl_generic_to_map(). Fix this by calling pinctrl_utils_free_map() and resetting *maps, *num_maps, and *num_reserved_maps in the error path of pinctrl_generic_to_map(). Fixes: aaaf31be0426 ("pinctrl: extract pinctrl_generic_to_map() from pinctrl_generic_pins_function_dt_node_to_map()") Signed-off-by: Surendra Singh Chouhan --- v3: - Clean up pinctrl-generic.c changes cleanly to apply cleanly on linusw/pinctrl.git devel branch. v2: - Move map cleanup inside pinctrl_generic_to_map() helper in pinctrl-generic.c so all callers are protected from memory leaks, as suggested by Frank Li. drivers/pinctrl/pinctrl-generic.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c index 9759b0186bcc..fd6bdb74028a 100644 --- a/drivers/pinctrl/pinctrl-generic.c +++ b/drivers/pinctrl/pinctrl-generic.c @@ -42,33 +42,44 @@ int pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *pare ret = pinctrl_utils_add_map_mux(pctldev, maps, num_reserved_maps, num_maps, group_name, parent->name); if (ret < 0) - return ret; + goto err_free_map; ret = pinctrl_generic_add_group(pctldev, group_name, pins, npins, data); - if (ret < 0) - return dev_err_probe(dev, ret, "failed to add group %s: %d\n", + if (ret < 0) { + dev_err_probe(dev, ret, "failed to add group %s: %d\n", group_name, ret); + goto err_free_map; + } ret = pinconf_generic_parse_dt_config(np, pctldev, &configs, &num_configs); - if (ret) - return dev_err_probe(dev, ret, "failed to parse pin config of group %s\n", + if (ret) { + dev_err_probe(dev, ret, "failed to parse pin config of group %s\n", group_name); + goto err_free_map; + } if (num_configs == 0) return 0; ret = pinctrl_utils_reserve_map(pctldev, maps, num_reserved_maps, num_maps, reserve); if (ret) - return ret; + goto err_free_map; ret = pinctrl_utils_add_map_configs(pctldev, maps, num_reserved_maps, num_maps, group_name, configs, num_configs, PIN_MAP_TYPE_CONFIGS_GROUP); kfree(configs); if (ret) - return ret; + goto err_free_map; return 0; + +err_free_map: + pinctrl_utils_free_map(pctldev, *maps, *num_maps); + *maps = NULL; + *num_maps = 0; + *num_reserved_maps = 0; + return ret; }; EXPORT_SYMBOL_GPL(pinctrl_generic_to_map); -- 2.55.0