From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 65859366060 for ; Fri, 24 Jul 2026 13:29:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784899755; cv=none; b=t/qBJ12Olz1PrFGE+xipPfe0mhK4qGnEIz6lEQy/thfg+voPYJPWNgDVBhlc05NNEk5nEGA/7IBfCvL8EzeQKS3SWnMX98SwliYN3rBP974oQrrFQWxI1xOV2pk3mRKL6PmyJxRPJNOloFCieya2nc3/fVaDS3NXMn3HBSvOnVQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784899755; c=relaxed/simple; bh=yz+/AVCcs7dGYmuHmNbbQKIC/lt8UMfpEiho0iyjYiQ=; h=Message-ID:Date:MIME-Version:Subject:To:References:From: In-Reply-To:Content-Type; b=OEmE2gUjTtAQrFosChjyGENOIMLbNXe8gLlNrvpvzhBrD0jBaTBeeORqrWbW0+79QdFsEbSBHDXalRnNUnBoq1kNMdJ1dqEdKcXApfz9IlrxzAKoZfzmmXn70Y1KTny0bx2J1EjokJX9aoxMjbWfrtasXc01iN2vW0D+JRBfyD0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.com; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-47c2b362ee2so417059f8f.1 for ; Fri, 24 Jul 2026 06:29:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784899752; x=1785504552; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:to:subject:reply-to:user-agent :mime-version:date:message-id:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to:content-type; bh=aHuHrzO50Iy6z0MvBYXW3ZKFWlwXidTBEpMxTWDNph4=; b=SiYN+hiThzgAjm60UlZ3rjEKjX++LhMm2EeeAtjStC9Y1mz5zIFtzcyctZ29O1aAH+ vWckKMzOpvw59GBJeW3qrJZqHEknnWNxQ91V01xt9efazSQ4gzuC52HZhx+7ghiS1sbT tVOKP9F4y7tIpdTRHtBx0tPG9+PgKjGPezPPaXFxYITo8IS+JeodHTFXBfsMX8cHhf7G S2gpmsOIZxSbNAsSpuprFa1g2If1CGt6rrtxmR929pIRz8fj1h6os+SG8K1A5D2Vh0eP nV/mR3gIUqNPy8x4P4SrLHvkZFLkDDiz+iHSCXftaC7JO/y8fyrKGkDNpJebHxI2XH/n bAHA== X-Forwarded-Encrypted: i=1; AHgh+RoiS7+Ww8bNjxkfnWtmwcD972Qrk9kDsDeZshJPaCaD0Od8dHfrrH/6NetrhRX3RV5tPWq/VVvBZ3mnGWI=@vger.kernel.org X-Gm-Message-State: AOJu0YwMtxJjGt5FH+e9YkNiFgJajjACsW+f1mIi/1t4ZPN0+QlLcxOo cqPH/ag+FXDhfyNk5gDdxsboWunxOKr0MSTGDPaZyZ7Po5mqqTONP1rB X-Gm-Gg: AR+sD10fKnsGNh7gzW6V/AsQZH1Feady8L0AHwfl5cvQ73sSwQdEBv2MNQeWFCIB02C PMdPnif+AcjkkWeh5FzPcY37wH/S31LPWqGfHm1x5AnKFuQG/H2f7qRWU3K8fxktLJXvo8qNGRM n+WgIlgqXimMWJ0nSSpyGMGmm2VaViYH1ftUzUEd/kLIAmBmtu0J+TrcHM2enTrVrloodl4GaIx 5FDWusGxjbGCAxgz5pkcbzH/k1lrYNvH/RkkbU82YhYIyy/NeNakx7luyz80PjXUUXHSeqGVDJM 8XEEsdC2XM3/xslsKJlJWKRfHhPl0OmlAL0uZMklyUWmK6ngX6nSRq9D9gNix3A3a8RC63un9xh OJTjdUnAGEpUzYVfI4eFTCXnmSmWJOSfKG5uqnWXlbP80K5ghF0D9a3f9RfnKKp+sTmiROA4hAA == X-Received: by 2002:a5d:64c4:0:b0:47f:9ac6:ca5b with SMTP id ffacd0b85a97d-47f9ac6ccbdmr2258907f8f.37.1784899751418; Fri, 24 Jul 2026 06:29:11 -0700 (PDT) Received: from [10.68.32.41] ([5.194.84.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c7880dsm25036785f8f.37.2026.07.24.06.29.10 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jul 2026 06:29:10 -0700 (PDT) Message-ID: Date: Fri, 24 Jul 2026 17:29:07 +0400 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Reply-To: efremov@linux.com Subject: Re: [PATCH] floppy: unregister platform device on add_disk failure To: Guangshuo Li , Jens Axboe , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org References: <20260708105703.747262-1-lgs201920130244@gmail.com> Content-Language: en-US, ru-RU From: "Denis Efremov (Oracle)" In-Reply-To: <20260708105703.747262-1-lgs201920130244@gmail.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hello, Thank you for the patch. On 08/07/2026 14:57, Guangshuo Li wrote: > 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 Reviewed-by: Denis Efremov (Oracle) I would also add Fixes: 47d34aa2d211 ("floppy: add error handling support for add_disk()") Cc: stable@vger.kernel.org > --- > 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; Thanks, Denis