From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (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 49BDA35DA78 for ; Sat, 25 Jul 2026 02:22:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784946122; cv=none; b=Jkrf2fsMBmQzLdjWc/YMwKN6m2eKmyILQoMLgsf5HT7GOu+iLyyPrWKyQAX5ppLFcvrcpAhYoKF0pW5CmwYPwquD5IiwKiESyba6Iz1Or7JJMVfhBFU41ySoKAij/QicU0AmKucqYwXc9CA1eO6rDK5kKlPwyXoIioOYs9A2SG8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784946122; c=relaxed/simple; bh=5UEYcYyjjY3SOWoaiJ4SAjYJjXuFSRh/DHUfYF6etEc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=DKLvzi/Uqz1lWrHU0Yy3nbZyeDZR5kpfZ1pSqTtj1doNg2kI+uyJnVSlvQPRrgDPLcdvhlHOVQLC5bBVHSJkObaQ9SDUa2INhOmhljOGFihkgsvmNUsn7GCEVyzCIEnVL/sl3NDPLyPpRnC08WfYuDLrxc3hL182YwMKSPAFxwM= 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=ptYb5i4S; arc=none smtp.client-ip=209.85.210.172 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="ptYb5i4S" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-84864086bfeso1033400b3a.1 for ; Fri, 24 Jul 2026 19:21:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784946119; x=1785550919; 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=GMDGd9nHDZFwlC3wb/2FA/AZe4zicRNBJy5t3j3kPU0=; b=ptYb5i4SP8TOtmKCta/F1QHuZuuVMqomr0UDxZTxbON03heu39Gy5lld8MU1zdLOhf wDtOhyIRjgtnXPf0sNzHQNl6d0jt2nGYKKKFejW20nHPVBnfty+Zf8DIXaRT3imjDhFa eGxs+IR2I3vSPNUzv3LJiCe8SZsivCo7qbjCug1WMG8cG8HsqbrQlRRamz5xth2i4i3u 1+7DL6+l0sB+zkTG9ZTTJWiEYAZjnK77MuFmZ3LUZ9lMKwqBtJlSYqNGg59hj6OfXxqW GsB2YKpT2F2yD10OGlsfJehBdwOxvHy0wGSQSeK9Q0PEYs1gkWPfuoRtT8wmmNHVvXx4 FSrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784946119; x=1785550919; 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=GMDGd9nHDZFwlC3wb/2FA/AZe4zicRNBJy5t3j3kPU0=; b=Q7+hP7D/QgkdHVE2KhZMU33/9Tf5VElA7o6oWFlk/Yu0q+vHF164B0/V7iwgih1ab6 BlRLEtnEZzfyVYmsu8foEpZcexXrxUGxd2JxWPPHYsRYxNBH1FEW3N5VGZmiYjHIaDwe 1huxtA8xWJYFc2BCmQum0F5dnJAx1ZDsaWMR2MyoxVKpH9n5/7ilBbuzP7oRoKof/EzW jr00UQOr58wzU431P7w5lXeepbEOcMBR0xzIJ1dCLoUlfpjZ71hBI46EBtlhMwS6YgBy LNeCkh41J2+N0fvx3+Mzol0nkEpkplx1bWj9E9tzRl+iQL9aLufyjJ2L+grWe+aNlW5U H+TQ== X-Forwarded-Encrypted: i=1; AHgh+RqdbJWTgtEb4GIcjj2W2lkYaYaQ+FqJG9y55SIbawTaHHvJXBta2VxfTAQgiYEULvuitMgu9xtSQxyh/SU=@vger.kernel.org X-Gm-Message-State: AOJu0YzLZ9mjyNhIsk44NKI8QJld7xo2+EkmbgJfjCuoFXlmFdH0K22B tv1NJLD1FLSvGm0mmH4MynhqTtz+QLtwDMQJrQn7uWFCWDVU/9SaC7Y= X-Gm-Gg: AR+sD13/1ea2Tv4j2iAh41vxNQmg33PN6JoMzx4YGtMDQZ+eQ5rZ8ZBUoxhnmtVAViD 1wCde2mm90jVXqKCFU6FUB/Ki2RbPxQPhKfnqPHeMBMbLYdiyaA9NfQ+atvd22Z087mDxvNYMD7 u+0nQsvBAZ9YCfWZXdhnjcb9ZYyCqLMaAFbNv9lhaa03/dyWNM9VL04QgaFU1QeurgI6XzssxKJ jeuGS/FlqOTdV7LnvM+8Qel64A0R0DuAyZmJKLVp/kyGia6XO1dC5wfNCnCuKCmzQvq3aoIlzUm YODfOzSkTT6SHRBeiTQuTDh7RKQ1dSCxdfLylHagfoxxnmXlxDwi+ONlEfaBmW8ls7qq4bAcb/d Z6ywMdVD8o/exXkSiD9RrQdYEBrx7PyfWzx8GoP8N3Scj3EBmw9X+1I6fxv00B7JP9M9MlKeIOG rXtUDBwDkQQBsVIW/hQ+dTY7mQAmM= X-Received: by 2002:a05:6a21:6e84:b0:3c4:3ada:384d with SMTP id adf61e73a8af0-3c67ddb636cmr729296637.30.1784946118841; Fri, 24 Jul 2026 19:21:58 -0700 (PDT) Received: from t-rex ([2401:4900:51da:a518:29e0:5b58:1f42:c54d]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-314bc3e261fsm4806094eec.6.2026.07.24.19.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2026 19:21:58 -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 v2] pinctrl: generic: free maps on pinctrl_generic_to_map() failure Date: Sat, 25 Jul 2026 07:51:50 +0530 Message-ID: <20260725022150.9214-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 --- 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-mux.c | 4 +--- drivers/pinctrl/pinctrl-generic.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/pinctrl-generic-mux.c b/drivers/pinctrl/pinctrl-generic-mux.c index 927c7aa616f5..da5a5ec01583 100644 --- a/drivers/pinctrl/pinctrl-generic-mux.c +++ b/drivers/pinctrl/pinctrl-generic-mux.c @@ -58,10 +58,8 @@ mux_pinmux_dt_node_to_map(struct pinctrl_dev *pctldev, num_maps, &num_reserved_maps, group_names, 0, &np_config->name, NULL, 0); - if (ret) { - pinctrl_utils_free_map(pctldev, *maps, *num_maps); + if (ret) return ret; - } ret = pinmux_generic_add_function(pctldev, np_config->name, group_names, 1, function); diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c index 9759b0186bcc..d5f07f4a8b88 100644 --- a/drivers/pinctrl/pinctrl-generic.c +++ b/drivers/pinctrl/pinctrl-generic.c @@ -42,34 +42,45 @@ 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); static int pinctrl_generic_pins_function_dt_subnode_to_map(struct pinctrl_dev *pctldev, -- 2.55.0