From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (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 C8BB042F6FD for ; Thu, 13 Aug 2026 09:54:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.70 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614871; cv=none; b=DnNvbCBBKv6DILmJrNIgb9YPYNNizrEV7bBlYx2UqijxFIlYKp0DCN2Li8MSvHxluLpegSshgtgThkq1VdvyzB7FYa1WC9kqGxl4rqhbYoA+EqWPm7VnD7yooSnqUrIYnrKJE2vwMRb93/KOqyeFeVvw5HDX7+CWrL/IoUob4mQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614871; c=relaxed/simple; bh=k9iJKp3LgdKhIQ70Bi03DrkmK+ZUWj0UMwC4YbV5odw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=NffLLkmFJb1J/dJ88dLJLFTcqNitAkPwakRqJxHSBzAar3i+FBe8my7RiWyAJF9w3wUyHZrE3ua+GSHJpul4ucPatixJE9QdHsbX4v9stOMYbxwIakpyvpEFam4HjkzPM8JXfv6YtGKX/Z5AKJku4Y/3Mln/K7yGBDMw4FJfPoM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=hlDRKmzM; arc=none smtp.client-ip=209.85.218.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--tarunsahu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="hlDRKmzM" Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-c15e82278cbso112067166b.2 for ; Thu, 13 Aug 2026 02:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786614868; x=1787219668; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=fT6jyW0ebkoIBHvxF4dzhS8i8Cr8YB5wD7+pzVH5V5U=; b=hlDRKmzMBu46gWgO3KB0hhJGktqtv85suRADD/MhB0sgzEfUFCx4iAWqit6cfKsrVi 2qI1RRDYm4O8eJZO9rk561uSrdo0WOMgEKwcrWaJF3YUuYa6wBiCKzgHiwc+j3Kf+n3+ RNpERAfCKbxPiDdfOXuHsvegJdSgHaOJp/a1h+vRqZZeYqu7NXlFcsfvqMSvm7ySp9Kw Li4HvT30HNvBLaht4neZpRAQtXV2yDYmALk5r2sErKEvOgn0cmRb9yaa8cK5f+SksneL W+bih+Iast/uWd+Vsym4X0UzRdasiOdgbsaj7mw30j38Hwua1BKR0tI21Yjao6w7U+hL i0uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786614868; x=1787219668; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=fT6jyW0ebkoIBHvxF4dzhS8i8Cr8YB5wD7+pzVH5V5U=; b=OVt1BVwCkSBVZMuOP3ClQ21DsLXyirA29jqruO2wmtxfEDOGYYUBOaFftVBp2MGYXY VEzHD+YNhE5Z0q2OVBSmr3UK1ElmMmdshRfDTEnUkVATLio7MzDMH0YXuWqeYaL0Nir6 +4UYpZkjvmgWhe4V4Ml1/6wCRZV7j63FxB9kxN5pGm3a+OmWIIMIpuJB5Y7jpYge1iur ZPXWGCMlJbzSs+PFj2G3ZG8GqhJeRzrO9VADTdFEeldeMFewEIvYXjkqNZzQzjExKmVB Z+dJl20f/c+bSY0Al2Uo2jjS5NG3FXci5qfZeRA28QHzLaDwVKhU3AG+tKPLWVbytU87 atsA== X-Forwarded-Encrypted: i=1; AHgh+RqHXKrd3xf1KXaqcjB7Wj2mMX8XyiIQiiDBdhkPM1SVbAr7dQrUqYI6f1DJVF+HbgeWTWO4SfUdy7jp3bU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/f0tjMzt0IWMKr9KfYHocdRkMj4UrpZ6kaFTd9l6piP00kbw0 hhtFSTBD6rsvUHBsh0JyOLD2QQ2pjQLCVUkoQEx9v7duFi58i4um+O5I8qDl4kMyYuTbopR0Y7k h3C0m9+fecnowcDebkA== X-Received: from ejbdx22.prod.google.com ([2002:a17:906:a856:b0:c21:1508:2a]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:a689:b0:c20:31d1:a899 with SMTP id a640c23a62f3a-c2108f37134mr206587566b.4.1786614867700; Thu, 13 Aug 2026 02:54:27 -0700 (PDT) Date: Thu, 13 Aug 2026 09:54:21 +0000 In-Reply-To: <20260813095421.1700945-1-tarunsahu@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260813095421.1700945-1-tarunsahu@google.com> X-Mailer: git-send-email 2.55.0.699.gb54405d56f-goog Message-ID: <20260813095421.1700945-4-tarunsahu@google.com> Subject: [PATCH v2 3/3] powerpc/ps3: use put_device() on device_register() failure in ps3_system_bus_device_register From: Tarun Sahu To: "Christophe Leroy (CS GROUP)" , Madhavan Srinivasan , Russell King , Geoff Levand , Michael Ellerman , djeffery@redhat.com, Nicholas Piggin , Greg Kroah-Hartman Cc: linux-arm-kernel@lists.infradead.org, dmatlack@google.com, Pasha Tatashin , souravsgl@google.com, skhawaja@google.com, linux-kernel@vger.kernel.org, driver-core@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, Tarun Sahu Content-Type: text/plain; charset="UTF-8" When device_register() fails, calling put_device() ensures that the device reference count drops to 0, which invokes the release callback ps3_system_bus_release_device() to cleanly free the device and its associated driver core resources. Signed-off-by: Tarun Sahu --- arch/powerpc/platforms/ps3/device-init.c | 83 ++++++++++++++---------- arch/powerpc/platforms/ps3/system-bus.c | 2 + 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c index 9109c218a060..8d0c77db1764 100644 --- a/arch/powerpc/platforms/ps3/device-init.c +++ b/arch/powerpc/platforms/ps3/device-init.c @@ -90,14 +90,12 @@ static int __init ps3_register_lpm_devices(void) if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_register: fail_rights: fail_read_repo: kfree(dev); @@ -121,6 +119,12 @@ static int __init ps3_setup_gelic_device( struct ps3_dma_region d_region; } *p; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB); @@ -164,13 +168,12 @@ static int __init ps3_setup_gelic_device( if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return result; -fail_device_register: fail_dma_init: fail_find_interrupt: kfree(p); @@ -192,6 +195,12 @@ static int __init ps3_setup_uhc_device( u64 bus_addr; u64 len; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); BUG_ON(repo->bus_type != PS3_BUS_TYPE_SB); @@ -252,13 +261,12 @@ static int __init ps3_setup_uhc_device( if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return result; -fail_device_register: fail_mmio_init: fail_dma_init: fail_find_reg: @@ -291,6 +299,12 @@ static int __init ps3_setup_vuart_device(enum ps3_match_id match_id, struct ps3_system_bus_device dev; } *p; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d: match_id %u, port %u\n", __func__, __LINE__, match_id, port_number); @@ -308,15 +322,10 @@ static int __init ps3_setup_vuart_device(enum ps3_match_id match_id, if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d fail\n", __func__, __LINE__); - return result; } static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, @@ -327,6 +336,12 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, u64 port, blk_size, num_blocks; unsigned int num_regions, i; + /* + * ps3_system_bus_release_device() calls kfree(&p->sbd). + * sbd must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct ps3_storage_device, sbd) != 0); + pr_debug(" -> %s:%u: match_id %u\n", __func__, __LINE__, match_id); result = ps3_repository_read_stor_dev_info(repo->bus_index, @@ -395,13 +410,12 @@ static int ps3_setup_storage_dev(const struct ps3_repository_device *repo, if (result) { pr_debug("%s:%u ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%u\n", __func__, __LINE__); return 0; -fail_device_register: fail_read_region: fail_find_interrupt: kfree(p); @@ -445,6 +459,12 @@ static int __init ps3_register_sound_devices(void) struct ps3_mmio_region m_region; } *p; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); p = kzalloc_obj(*p); @@ -461,15 +481,10 @@ static int __init ps3_register_sound_devices(void) if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d failed\n", __func__, __LINE__); - return result; } static int __init ps3_register_graphics_devices(void) @@ -479,6 +494,12 @@ static int __init ps3_register_graphics_devices(void) struct ps3_system_bus_device dev; } *p; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); p = kzalloc_obj(struct layout); @@ -495,16 +516,11 @@ static int __init ps3_register_graphics_devices(void) if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d failed\n", __func__, __LINE__); - return result; } static int __init ps3_register_ramdisk_device(void) @@ -514,6 +530,12 @@ static int __init ps3_register_ramdisk_device(void) struct ps3_system_bus_device dev; } *p; + /* + * ps3_system_bus_release_device() calls kfree(&p->dev). + * dev must be at offset 0 so kfree() frees outer p. + */ + BUILD_BUG_ON(offsetof(struct layout, dev) != 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); p = kzalloc_obj(struct layout); @@ -530,16 +552,11 @@ static int __init ps3_register_ramdisk_device(void) if (result) { pr_debug("%s:%d ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d failed\n", __func__, __LINE__); - return result; } /** diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c index 0537a678a32f..0918c74d3e19 100644 --- a/arch/powerpc/platforms/ps3/system-bus.c +++ b/arch/powerpc/platforms/ps3/system-bus.c @@ -774,6 +774,8 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev) pr_debug("%s:%d add %s\n", __func__, __LINE__, dev_name(&dev->core)); result = device_register(&dev->core); + if (result) + put_device(&dev->core); return result; } -- 2.55.0.699.gb54405d56f-goog