From nobody Sat Jul 25 20:48:39 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 3EEA9349CEF for ; Mon, 13 Jul 2026 17:33:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783964006; cv=none; b=Dj4y6zmfa6sboGoDuOXaGOt9KmskLzzD/BDc6ijEfS4qq3mSb1YoscYu5BqsxHBc/6ep2+Kf9o8v7ZX7w1Ep0hnKS2FW2q6LmIjeXAI5HPmyyobkPUVU+IXk+HDnwZuvGqh1vep7Fp7E08DrJrd78XlpkevjIzsV43JfXATJJso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783964006; c=relaxed/simple; bh=DX4yD1fceAw1TE2YJq//fl5Ld5WZXHMoH7nz+I58P6c=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=n2m0Co0ItM8q/Trep+l48ZiC+U3RUBx90Qsj44KTL/GviChsUcKeMXnPmWjT7LRNFuxzd9ASzOEmC8xyKyDLCRO0IlkSSjPvzWJWKu0Styhn4eT3GJ0CiHbBV/3z2cJPEAIv9e/dvBbNwMmkXXt18EXDkFn8yBo2KVnU/rtRvbU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VCvaSrdV; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VCvaSrdV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1783964004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=8qE4a9Od404gw/x9tLPMScB2hPPKwyyUE1M5NWdqvd4=; b=VCvaSrdVIBqyzr7hGWXlRMtIZnrhzSIi5SaFXUm7+Ei/XH9W/OEsFy5IA/pwQXyZozUACP e2BLXbjFMV0lQ9aJ6EjyHc/GVrEdOmW7CHSu59Lk4h5CT9cP5cl34AURABLYuNwTK9TL37 Ayc3e0+BmJGZ+j1o5uigbT9oOwhShrE= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-230-zH5eTQK2Ns6yNU_X8H0m5g-1; Mon, 13 Jul 2026 13:33:20 -0400 X-MC-Unique: zH5eTQK2Ns6yNU_X8H0m5g-1 X-Mimecast-MFC-AGG-ID: zH5eTQK2Ns6yNU_X8H0m5g_1783963999 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC408195609F; Mon, 13 Jul 2026 17:33:19 +0000 (UTC) Received: from localhost.localdomain (unknown [10.6.23.248]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 17E661686; Mon, 13 Jul 2026 17:33:18 +0000 (UTC) From: "Ewan D. Milne" To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, justin.tee@broadcom.com, sarah.catania@broadcom.com Subject: [PATCH v2] drivers: base: Remove statistics group if encryption group not created Date: Mon, 13 Jul 2026 13:33:18 -0400 Message-ID: <20260713173318.3060047-1-emilne@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 Content-Type: text/plain; charset="utf-8" If transport_add_class_device() gets an error from sysfs_create_group() when creating the encryption group, it does not remove the statistics group in the error path. Adjust the error path to do this properly. v2: Only remove statistics group if tcont->statistics is non-NULL Fixes: bd2bc528691e ("scsi: scsi_transport_fc: Introduce encryption group") Cc: stable@vger.kernel.org Assisted-by: Claude:claude-opus-4-6 Signed-off-by: Ewan D. Milne Reviewed-by: Justin Tee --- drivers/base/transport_class.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c index 416e9f819df5..351c3d3ce6a0 100644 --- a/drivers/base/transport_class.c +++ b/drivers/base/transport_class.c @@ -168,11 +168,14 @@ static int transport_add_class_device(struct attribut= e_container *cont, if (tcont->encryption) { error =3D sysfs_create_group(&classdev->kobj, tcont->encryption); if (error) - goto err_del; + goto err_del_statistics; } =20 return 0; =20 +err_del_statistics: + if (tcont->statistics) + sysfs_remove_group(&classdev->kobj, tcont->statistics); err_del: attribute_container_class_device_del(classdev); err_remove: --=20 2.52.0