From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 1276C1F2B8D for ; Wed, 8 Jul 2026 10:57:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783508236; cv=none; b=rknMaYARm8Z88ZHDEeNThWtG23qOhXbQDtRRkPYCE9lPudBFV3SA7ohulha35hlfMbNO/nSIiUj1AlM0RfWs+K5o6akRMC3U0A3CK1sqgdJ+TW97XIZJEGhVx8CtTTI16MSruVjS8sxukue/LX1sY/BpgPoEfC/lJbeyMe5ah7w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783508236; c=relaxed/simple; bh=kBUME9+6xIyWuaIS3fhzOwBqwuFrfcS707RgECLo/iY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=cex8ATBSaFh+OWFE1A1InCc3CsvgUuKfSDGhNTKDZPMDdETCwZmEYYl4EYZrOfKWVXZTqk25iM9shTajTRZGKs9R5jO3fvHAXzYkY5A1KBMFkiOtoXRw+nkGFFCaqFnpQwzfWfnLd5BZa8An1p6clkCJ1Wm0o90mPQXn3BeQ0AI= 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=c5XsicPn; arc=none smtp.client-ip=209.85.214.169 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="c5XsicPn" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cacd69a9c0so6431215ad.1 for ; Wed, 08 Jul 2026 03:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783508232; x=1784113032; 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=5aYPVA5+Id6wN+hTSn6+3yuMuC7pfUDdgUd36EQG3A8=; b=c5XsicPnW7j9j+g9Abapi85qxuzTIFv4r22q2ftKqLqqfa+L2JCIlgUaG8EfkdN6oS h/9fLhe0FOC3tQrVFbCOODuZ974/gstS1MqoOZZUFldVCRXo9CdfbaGO/Tv0Joy3jeSw ystcjeHIx0p25hnpRzNKAmRg4Bvzyr39TRlSM065FkxtODASmguXNnckt6sWC+CznPYn DJIzMpglwzwqY0bBhQzJSreBe9kqlmViTT7J4Hoq6TgSxS/x8zc14Ksoh3G+03XshB2z C8lYf2cZMSEJVVhqCnYe8Ua6TMQ6dUBWUY+XK/XrIFd5mf/urr5kJ4du6AhLr5JyZRUB /MMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783508232; x=1784113032; 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=5aYPVA5+Id6wN+hTSn6+3yuMuC7pfUDdgUd36EQG3A8=; b=MqVSCHryfKHgmHLAoghyG3Nb0wUfNwHA1hcdA4wbBIWlhkMmTLAbqXG/T+nNs7hKVM QAyi5Edp3Rh19X0aRtNDslqFv8GsgJKp2tt/f2zZNdE49a6MAgetBdLgfkHpSqv6nUuj 6bZnZSb+SqRKXxAg1TM/LYfnqRDFWemiHBb0kxNadJ3cD5ANHXDU03XwIDmQx/4pUIM/ 0TfZOQjuNHf3i9LWFyJulvHAIdz04cilhT0/rG6V5T2+NoHL8UK84HXwxBxIWxSjSkiJ d2sa1FkgaiImtLezFiy/mzWE7FVngANp5K88lIxWnGMJE9y7Cprzi0XRxOcijPslswva b+rQ== X-Forwarded-Encrypted: i=1; AHgh+RrwKh21dNCC5XkD+P0rpo7qx+CNFeE/kNMwjnF3UNX83TminY4D+0TJqlUdX1Gs51P0xPiXyooUSYwel/o=@vger.kernel.org X-Gm-Message-State: AOJu0YzoZ0/tHiE1QFbSqvoyP6O4VLkJchEacnJk/Ft5xSWNS8lHW/MD T9arsqxqpjs83hKsau4zxy8EEA8D5eI7QVCLJCbSjmsNoqMKLHVcXXJ/ X-Gm-Gg: AfdE7ckPgr2SVfcquYhuMJTnUYJKHAFrV3/Hf2aqqTEGt5YSC64tG0NblOZvDmvP3u0 f+BfYbpevHg0EL5Wuo4c83CedhGhg5rH4sxjv6ogCc0fX8+kWsqJAx0XO3DvyFmY9vx5lOzKQcN VCIg3HVB9NngOYqsJTmwAACwOfQUKcjRiEEB+p7FktuZobONZqmUiDUrCQnXyC1q3xcXXv99VCS 7vdpSmiDHYp3fNRZy3XjV8FbGPchhpezWPQfhPU5nG6030UiAXBFrlaXjn6Mb9O3I6BHMtWGRW7 ASzwvPTCAApA0LajkZdjy7OgZnIpm7cguBzXZKBgZkyBJnVV62cGQCoaO8RcMVeyer4IKMqKTqj OGTGCyxW9JiUdYFeeIlsTIrLFBeKulcXSaN3xS5iqLkMQVvAWvH2+MWwQjHZALyXPO2eP+bpMQ1 RyIg== X-Received: by 2002:a17:902:f685:b0:2c9:e2c1:4fb5 with SMTP id d9443c01a7336-2ccea40b669mr19564265ad.22.1783508232135; Wed, 08 Jul 2026 03:57:12 -0700 (PDT) Received: from lgs.. ([152.32.251.59]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc99cc5aasm26490935ad.0.2026.07.08.03.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2026 03:57:11 -0700 (PDT) From: Guangshuo Li To: Denis Efremov , Jens Axboe , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] floppy: unregister platform device on add_disk failure Date: Wed, 8 Jul 2026 18:57:03 +0800 Message-ID: <20260708105703.747262-1-lgs201920130244@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 The change referenced by the Fixes tag reverted a previous fix because that fix added incorrect cleanup for the platform_device_register() failure path. However, reverting the whole change also removed the cleanup for a later failure path. If platform_device_register() succeeds but device_add_disk() fails, the current floppy platform device has already been registered and registered[drive] has been set. The common out_remove_drives path uses while (drive--), so it starts from the previous drive and does not unregister the current one. As a result, the platform device registered for the failing drive is leaked. Unregister the current platform device directly on the device_add_disk() failure path, where platform_device_register() is known to have succeeded. Leave the platform_device_register() failure path unchanged. Fixes: 895a9b37917d ("Revert "floppy: fix reference leak on platform_device_register() failure"") Signed-off-by: Guangshuo Li --- drivers/block/floppy.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index f04397b8e381..7a34af534460 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -4729,8 +4729,11 @@ static int __init do_floppy_init(void) err = device_add_disk(&floppy_device[drive].dev, disks[drive][0], NULL); - if (err) + if (err) { + platform_device_unregister(&floppy_device[drive]); + registered[drive] = false; goto out_remove_drives; + } } return 0; -- 2.43.0