From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90943348C47; Fri, 4 Sep 2026 05:46:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500780; cv=none; b=JfG77N70zmmTXB1atrFDRYGeRBr+vnRhwbSoxlCynXdcxI/mkytWUk+AQP7SZ990Wgtd/+bZRUNfdu44VA01WACN6STMIm+MDu+MFroVhMRCitVjdXeJ00C9KSAdL2+HtQqa/ue82fLrCgGHxnMoyWpdVV6jIeg5ZY0OtT0Xjsc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788500780; c=relaxed/simple; bh=/+7Mez+ic0I3fYKYNRGCjLvzAn7kuWi85aN36ogPLC8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LFuMuxVaaUBX4k5Qtx5TIfrnbJ9pwzhARBgJbIlcRqWS7b8/RYze+6WQAldCO3YsWp6eZ2T9WW9mjKXnAvRVFi8tM86f//bBkofIr+H04W+NLh4xFwfU45q/r8JfJ7+2fM372oySYV8dTCNYUdGsyDVs/fyCv/pLOt/q+fMJlR0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lpC4esAz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lpC4esAz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9F8B1F00A3D; Fri, 4 Sep 2026 05:46:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788500779; bh=9y9E0GCUxtJQXvmylY0xxDcNc2l2bUNopYcmapFmhlU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lpC4esAzH0xkui12vs/lRpcHTAWurqDR9FwXKqDux9G+juSxt1cHXQEN78WrTXHM6 /eKLnBFbRAXRsXI9mWVftYOf5uSRFPuxnofijYtV+KuyQhNfkGgeKvKfdvX404dqU3 zVvmmGCLsnD+nSs9ApCNJ+4fQzJ3jTmbyKT5bwds= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Srinivas Pandruvada , Jiri Kosina Subject: [PATCH 6.18 178/552] HID: sensor: custom: Fix field sysfs group cleanup on failure Date: Fri, 4 Sep 2026 06:55:35 +0200 Message-ID: <20260904045753.055066446@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260904045747.813364717@linuxfoundation.org> References: <20260904045747.813364717@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit 3789d0802ddb4b3be04062caf4bfadd23496e9a7 upstream. hid_sensor_custom_add_attributes() creates one sysfs group for each custom sensor field. If sysfs_create_group() fails after some groups have already been created, the function returns the error without removing the previously created groups. Add a local unwind path to remove the groups that were already created. With enable_sensor exposed only after the field attributes are ready, this path can free sensor_inst->fields without leaving enable_sensor able to access pointers into that array. Fixes: 4a7de0519df5 ("HID: sensor: Custom and Generic sensor support") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Acked-by: Srinivas Pandruvada Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman --- drivers/hid/hid-sensor-custom.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/drivers/hid/hid-sensor-custom.c +++ b/drivers/hid/hid-sensor-custom.c @@ -609,7 +609,7 @@ static int hid_sensor_custom_add_attribu &sensor_inst->fields[i]. hid_custom_attribute_group); if (ret) - break; + goto err_remove_groups; /* For power or report field store indexes */ if (sensor_inst->fields[i].attribute.attrib_id == @@ -621,6 +621,13 @@ static int hid_sensor_custom_add_attribu } return ret; + +err_remove_groups: + while (--i >= 0) + sysfs_remove_group(&sensor_inst->pdev->dev.kobj, + &sensor_inst->fields[i].hid_custom_attribute_group); + kfree(sensor_inst->fields); + return ret; } static void hid_sensor_custom_remove_attributes(struct hid_sensor_custom *