From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f45.google.com (mail-qv1-f45.google.com [209.85.219.45]) (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 C40BE38D3F9 for ; Thu, 2 Jul 2026 23:08:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783033684; cv=none; b=pxjmE378JUUJcscETRu6qXyX2uqiqBJImzqX4FuWr8TCQaauGtsBey+u36YDc1cZLk0zieIR78YHvMBfSCKCbcqsEIp93VMVRx2fFHpftLFu0qp0kJiNxh4Xcq9GQnUU5EujJ7E+49OYfQyGAQ+MXCKu9t8m2j7ytYDbcSHEt2A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783033684; c=relaxed/simple; bh=q1V6Clsfn9YpzvOfxmEAQjnMPeZfQscgyNIn0Rtv/OA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=c+TstPWpc5a3YqJgodaTDjzAATXkmyQD2Jhmgnhic/KKNx4XhipUMoTea8aRH4sDxg75LSDQGrLGSWE1/vcQPDuZjp26iqwkctbWbnA0lzvOVMapKoexw5cGViEWEJUmb1cTmCRyI/k/t/pestJbFRTw9ujAImk/UxeVqbv1YzE= 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=TszTTrd+; arc=none smtp.client-ip=209.85.219.45 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="TszTTrd+" Received: by mail-qv1-f45.google.com with SMTP id 6a1803df08f44-8eff5ce3b95so20188796d6.3 for ; Thu, 02 Jul 2026 16:08:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783033682; x=1783638482; 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=bvgOKYK7T77g3oR+LPfWj5fFt53zZhcAY3csRaeP6rw=; b=TszTTrd+Acv5yb62RbiyjAfegl6TnMxzHOv33Mbm35/35Zs85LE2BlPk6qDjDH4L7Y GVBBBg/zqXYtivSjfce6qM1JI6iq/l+YEISvBS86tuumGv+ruTUcaFqWUiQ/wQ6exEbb aiKNyP3OovYTav13KJ8PPPcPWcrNuH43rCsvBYWxaIS7qTTV6zt6g658Pk9VfEDp2F5M sqjSsk+eQOH5w1RE3N3a2rDOdBqLcBmVlFOSJ1oizyCuecf5gE0VbJlUfAtWYKOwQZD8 W1sJA0eYk8hUYlSFKTKDAgt0dq9XCCmPnJCkfyab+tgt6C8UltPsng2Her8fuWeCIygB UQOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783033682; x=1783638482; 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=bvgOKYK7T77g3oR+LPfWj5fFt53zZhcAY3csRaeP6rw=; b=Ypm7IeD0oZ98QAcT2c6j1dTGwXWfur4jhI/TkAqxC3jAxHfB0ViF10Xc2b8q09RN5p Tw0wxVrfJV8O4U5Jv1Ic51EAuWRZ7gQ5NUg0BbdkhvK2CJ/3hmFVuupt0lE1CQd96Lqs pksDu6UTtHg3c/g+MNTZBYRD93qqizk4ku6haC1MVIGE+YtnbLrxTQfqOxHC5OBmRI+L m9SbubLj8AqGCdb82GstHlMeVMW41M7WLW1mnXbOY0aZtek5vQ9mpwvYHXVUF0BLmj+x kw5OPTmkyb8p24y5aiC/oWBWPgnaK/SbptbGRCA7IEsojNbp6hh/PdK/5rf94NwdFs+f a4Ug== X-Forwarded-Encrypted: i=1; AHgh+Rqn0Sp0YmEsuEBXNWCx2NB6yBWskxWMfoAdsepJcSllc8R7WLf4BXTKkgFJ8QZb/CPo4RfRknmDdzDLPt0=@vger.kernel.org X-Gm-Message-State: AOJu0Yx9e3xI/9GyK6gC6SRIeNVgSHoXPu4Y0XUr1FjJWmJc/tJI+k48 a9CFmdt9alGBL8e7cK+UTlFyg449dSAylf1ELA+tC8Rin1EQytUuaELl X-Gm-Gg: AfdE7cknfWKZwrA26fmUjstKGG1bQNtfNzBNJTromHhHpUkJWqBld8SIYY4z6GfzaIN dJ4z5vYD2H+gtzdYZJdQpWlAGx1tVgFLFHIhyPjxSOpD+bUlL1HpXz3z5KxX9THvn43LdKagEUn mutgLBNVjm8msu3t1w5BHyU5NzNpPHuGhLSoEl25yMGy9ngJTP2oocp9XLVYRGnAaclrXQOJhKy eNmMMWGwA48NpL65m8sAHfk6/mHfEQP3DnYMxyH1+5SNTJ++FpxnHrlU+eU8ac8q+oBTZ/tGcws hDy3uj/2BxjMcp2K4Uw438E4aumtgDuZmQ6GulF+7pC92OEG5SfTEjywaT7CaxVnLRPbHY/ZVlI ozlxHh7/SqzVnuvgn3R8zbopsIJrhA/W2YIL2IkmVL/XTKisljPsDK/2L6jmm+/Sj8Tx+D3JYdX 7KMhx0vjHIaYSNJhVZSGwIZbSxC8wa+TcL55a/U/7B976jIXQfOQgUDLXrbvuxtFXHG+s3+49Jw DiRMYvTh6HT9VY= X-Received: by 2002:a05:6214:33c3:b0:8f3:4ea2:427f with SMTP id 6a1803df08f44-8f4214a217dmr92582856d6.1.1783033681514; Thu, 02 Jul 2026 16:08:01 -0700 (PDT) Received: from i4-gl-tmk5904.ad.psu.edu ([130.203.156.186]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-8f472a9d8c0sm38776506d6.49.2026.07.02.16.08.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Jul 2026 16:08:01 -0700 (PDT) From: Yuho Choi To: Catalin Marinas , Will Deacon Cc: Mark Brown , Yicong Yang , Oliver Upton , Zhou Wang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Yuho Choi Subject: [PATCH v1] arm64: cpuinfo: Fix sysfs cleanup on failure Date: Thu, 2 Jul 2026 19:07:44 -0400 Message-ID: <20260702230744.91169-1-dbgh9129@gmail.com> X-Mailer: git-send-email 2.43.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 cpuid_cpu_online() creates the CPU registers kobject and the base identification attribute group before optionally merging the SME-specific SMIDR attribute into that group. If the base group creation fails, return after deleting the kobject. If the SME merge fails, remove the base group before deleting the kobject. Fixes: d69d56496487 ("arm64/sme: Expose SMIDR through sysfs") Signed-off-by: Yuho Choi --- arch/arm64/kernel/cpuinfo.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c index d50e2a9b066b..141bcfa4d611 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c @@ -380,9 +380,19 @@ static int cpuid_cpu_online(unsigned int cpu) goto out; rc = sysfs_create_group(&info->kobj, &cpuregs_attr_group); if (rc) - kobject_del(&info->kobj); - if (system_supports_sme()) + goto out_del_kobj; + if (system_supports_sme()) { rc = sysfs_merge_group(&info->kobj, &sme_cpuregs_attr_group); + if (rc) + goto out_remove_group; + } + + return 0; + +out_remove_group: + sysfs_remove_group(&info->kobj, &cpuregs_attr_group); +out_del_kobj: + kobject_del(&info->kobj); out: return rc; } -- 2.43.0