From nobody Tue Sep 29 02:33:42 2026 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (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 CD37143E9C9 for ; Thu, 13 Aug 2026 09:54:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614869; cv=none; b=sd4DKRUpe+J96WY0Vq5/Ud58/6kWtJc0hGitjDf09RTqyQahnhzCiQCjIH7O/LnIqMkmM+5p+e1/5nw7mho2aQjj5fWDL+olndjYZ0KTRwPexkgeCvmJvHIKTL/rzedszeQv9t8yTXE/FjylphVXB5OFToqb23Ryxeknr/RSNGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614869; c=relaxed/simple; bh=ZrzVy4++WKAZ6CcT1q+LHfjHpB2pCNjESfLLZY0Kclo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ElVnfKJV56j9EsuPGYFvCQ4VaA0WH/FM02qnH0GVG52jLsnGrPrL/XTzcENuvKYtttJcXC1gmULQW3/M01KSP4AogNbixyFH322wlnN04nI3+DvoUydPHHupSAwLOaeSSOtiLqAVL4uE45GPFsh9N9X3tiJGEFrQH66ABwqJc0M= 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=uclQKIWp; arc=none smtp.client-ip=209.85.128.69 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="uclQKIWp" Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-490a767b782so15718215e9.2 for ; Thu, 13 Aug 2026 02:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786614866; x=1787219666; 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=w9wwW7mRQHxWYHcAeYLej02klFAo7h8n1OW6fMkc7LU=; b=uclQKIWpjuCRa/ftQkt5IbBqP6TkufK6i0DVHPYKXKR+HEtaqOYUTvoWGiKBLJmVQh MKLGTBG6lSbxdN2nkO6qIlNyI4ugW+VaWNflSKhR4uJV7+uPCAxt1nHV03bXda8WjJ3V eR1bvODY8CjPdlEbULNhFvnm0wcueakREgURISBzMXS/CI9+f/C1MM73aoPyCfXcKwS0 6mXzS8zswpu5OYuUJ2mKnPC4BZc+9JRliDai7Enl6tj/DwPA7HB2jdZfFRDdAyuAlkI0 sOB8vYqJrwOxw1MXEXaBkGw2aU5EI3NcIOizmKCIZEeN7FVCDcs8xCHqJAIa5I2WDNyy 5TSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786614866; x=1787219666; 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=w9wwW7mRQHxWYHcAeYLej02klFAo7h8n1OW6fMkc7LU=; b=JyFym1QM05XbECs9DBkbGlhFGEVn9ugj80J8tXp6kXeISWMFZ94Wo3USfjE3dTpRzE EyP/W0VcCtuWtj+PWb4lCKRErQlL4xpNEK0TCTj1flsXcLqvIYpWg9PshaMMrOhZoDNt 7Tqzo0KpsB9th1lX+Vrt3Fg5uXQQsQmOHX2CsavJcc/k5s0BZxTbs08u+HDYj4HL6Xx9 ZitvToC881fRgs/MaEQ+WPYDpR2k/uM+rP5lQ6PTa0fumme2Mj351NUOa1J4ITyMr5Ov zipgiLKSS3FUouRobGncTi4y02r5Lz0dO79pnsbkWdhP0klkwYHDKnR2NP7/OfR66Ltz n6bA== X-Forwarded-Encrypted: i=1; AHgh+RpQvQzm9vA9ij6nxpe8pQXfH+IAV0JSwQhSEKTERbMLHAszOViO8DcuRO4ZA6aFmzlQMY/wgO565byi54s=@vger.kernel.org X-Gm-Message-State: AOJu0Ywvjgg2eVPPr9fajNeyJqT7PTzskOi/FDmmWS4GD6OasTzbSC0c NshJyyZ3bW8p4KVE0/LRVMY8YTV/h6h86Fry3U5AiaCM4Cqx9xObeOvSeuu4Ap0896ThUKZ9ZCl X5ltHk38Ths1E1oR2ug== X-Received: from wmbf23.prod.google.com ([2002:a05:600c:5957:b0:495:5899:6e45]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:b99:b0:499:7a5e:4c3f with SMTP id 5b1f17b1804b1-4998215a94fmr44349825e9.1.1786614865465; Thu, 13 Aug 2026 02:54:25 -0700 (PDT) Date: Thu, 13 Aug 2026 09:54:19 +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-2-tarunsahu@google.com> Subject: [PATCH v2 1/3] ARM: locomo: use put_device() on device_register() failure 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When device_register() fails, calling kfree(dev) directly bypasses the device_release() callback (locomo_dev_release) and leaks internal driver core structures allocated during device initialization. Fix this by replacing direct kfree(dev) with put_device(&dev->dev) when device_register() returns an error, ensuring proper refcount decrement and cleanup via locomo_dev_release(). Signed-off-by: Tarun Sahu Reviewed-by: Sourabh Jain --- arch/arm/common/locomo.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c index 55e360452828..0f6689d343b0 100644 --- a/arch/arm/common/locomo.c +++ b/arch/arm/common/locomo.c @@ -223,10 +223,8 @@ locomo_init_one_child(struct locomo *lchip, struct loc= omo_dev_info *info) int ret; =20 dev =3D kzalloc_obj(struct locomo_dev); - if (!dev) { - ret =3D -ENOMEM; - goto out; - } + if (!dev) + return -ENOMEM; =20 /* * If the parent device has a DMA mask associated with it, @@ -255,10 +253,11 @@ locomo_init_one_child(struct locomo *lchip, struct lo= como_dev_info *info) =20 ret =3D device_register(&dev->dev); if (ret) { - out: - kfree(dev); + put_device(&dev->dev); + return ret; } - return ret; + + return 0; } =20 #ifdef CONFIG_PM --=20 2.55.0.699.gb54405d56f-goog From nobody Tue Sep 29 02:33:42 2026 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 A8C1E43BDA3 for ; Thu, 13 Aug 2026 09:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.69 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614870; cv=none; b=YPxxHONlzbDeCyiSzLNatwEVEf/oypll4mjkHjufFAU5jLGc0DxpHb4u6IuHg/l5cxyYDQpaSKQVYXezvwsJgsBtx0p9xpnLXH1FJiRAruQ4A5IFaPMzseY6TpJyhgTXKUHos4wyZdLi6y6XByZ90xYichQMhxQBcU/qs4DYtdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786614870; c=relaxed/simple; bh=11qx+PtQ2pEMxgdfrgkekO+lbmRjyJQJNdojVzW2Rb0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=htRNGia6HwNEXckdhXFMa5lnGMDIji3dYRpVJxZKBfD+c+vS1x2ancc+C7w7koOz+5To8AaFlkk1yP+PsmkwURnlwigJjreM1rCbL+7MA0TNqXIqByFkSVvt6GYd3wqDDhVal/FO0BB0LdlEsVV8TakUK78a3kQhqqk6JcvbI7Y= 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=wHvwPRKF; arc=none smtp.client-ip=209.85.208.69 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="wHvwPRKF" Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-6a17bf3d42eso1729249a12.1 for ; Thu, 13 Aug 2026 02:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1786614867; x=1787219667; 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=c+Ghwm16zCb3XluSdXC+OMNEFWBin0x6u6wWkTNkW+w=; b=wHvwPRKFo8XuStYnPaEmx2Mni7BLUa/I3EPQYqScOaOuJF/jzc9ELGEYaW7dbHD6iI 1pUAkS2LUkPOw7e1f3UhHi/zQv9JitWaFB7qEzYQFuG6vhEJA4M+YTpa4Ia7RzWm/VqH 5impy7UTiDbJRFP81YPVKBNPH4mJesZ7c3UH6PEDit+Whjdqd3rDt6WgicXAlINVhBXJ LO7h7l1wif2KAXr3IJe8eDpVwZrZhEWqGk9zYuW4dJPJr8ezQ9gUXKCbzQo2Mg7TLhhC J/apAIb1FOqWSRnV2VaieWQvK9aFMVejUM35mC+ap4LdXQ6nQevWY6uQweWm9TN53sth NfHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786614867; x=1787219667; 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=c+Ghwm16zCb3XluSdXC+OMNEFWBin0x6u6wWkTNkW+w=; b=B2Vpo2qTAgcZ7MyBnYJLu4vkJWznpXItLRbErIWLxk4Sj+AjsMUGLaUHuwayC0S0+a OodGXpt1kZaPz8gR35egqkHdZeDTU6VOTgEw2W5eZGsVXoWazTGmcYFcmSve6xYy69b+ gw6MehQJNnDqg4Cq8ZKGFzAftNEHxnuFyRjyhORBBHBtXDrMHcvtOyOUblwQqatTgEGm 39rLsYH4zxIVOL6c0yT6O2fTDTqsQhLt1Z7kNFfGm64QVOs5XcgBxsdg2asPzkScDD1O ieYv8FFEBIr80fZgs0cqHqm7q2sFIiaxdOy+4pn/pjWjVXQdxiOqUFGR7GLd1FThuBUw PdpA== X-Forwarded-Encrypted: i=1; AHgh+Rre4XCLSOaoOoknHkhUAGJZobnbIjRt0ffmQw+neT24WcqLzBIOt0dyHCOoHzunNRT1r4N6LxtZBAy9PEc=@vger.kernel.org X-Gm-Message-State: AOJu0YwrnD00NvqjNbt/VFHMFiCQ2Ao4NG1KT1z09qw6mLA17WuG37nU +YCDNC5ztuatGd0NebDRDzfvAYvm+xJEYTc161yrsSfg3zMixAoHgJ/xcNtew7hpg0e4UiTmJEo 9khm1/EYjTZaQmyN0sw== X-Received: from edqz25.prod.google.com ([2002:aa7:d419:0:b0:6a0:51ba:9873]) (user=tarunsahu job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:1948:b0:6a0:a4be:6ed0 with SMTP id 4fb4d7f45d1cf-6a380618f4emr2015007a12.17.1786614866346; Thu, 13 Aug 2026 02:54:26 -0700 (PDT) Date: Thu, 13 Aug 2026 09:54:20 +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-3-tarunsahu@google.com> Subject: [PATCH v2 2/3] firmware/edd: use kobject_put() on edd_device_register() failure 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-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When edd_device_register() fails after initializing the kobject with kobject_init_and_add(), calling kfree(edev) directly bypasses the kobject release callback (edd_release) and leaks the allocated kobject resources. Fix this by replacing direct kfree(edev) with kobject_put(&edev->kobj) on registration failure. Signed-off-by: Tarun Sahu Reviewed-by: Sourabh Jain --- drivers/firmware/edd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c index f980c5b56858..763e7b16d517 100644 --- a/drivers/firmware/edd.c +++ b/drivers/firmware/edd.c @@ -748,7 +748,7 @@ edd_init(void) =20 rc =3D edd_device_register(edev, i); if (rc) { - kfree(edev); + kobject_put(&edev->kobj); goto out; } edd_devices[i] =3D edev; --=20 2.55.0.699.gb54405d56f-goog From nobody Tue Sep 29 02:33:42 2026 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-Transfer-Encoding: quoted-printable 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 Reviewed-by: Sourabh Jain --- 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/platfo= rms/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; } =20 pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; =20 - -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; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); =20 BUG_ON(repo->bus_type !=3D 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; } =20 pr_debug(" <- %s:%d\n", __func__, __LINE__); return result; =20 -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; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); =20 BUG_ON(repo->bus_type !=3D 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; } =20 pr_debug(" <- %s:%d\n", __func__, __LINE__); return result; =20 -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_matc= h_id match_id, struct ps3_system_bus_device dev; } *p; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d: match_id %u, port %u\n", __func__, __LINE__, match_id, port_number); =20 @@ -308,15 +322,10 @@ static int __init ps3_setup_vuart_device(enum ps3_mat= ch_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; } =20 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_repo= sitory_device *repo, u64 port, blk_size, num_blocks; unsigned int num_regions, i; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%u: match_id %u\n", __func__, __LINE__, match_id); =20 result =3D ps3_repository_read_stor_dev_info(repo->bus_index, @@ -395,13 +410,12 @@ static int ps3_setup_storage_dev(const struct ps3_rep= ository_device *repo, if (result) { pr_debug("%s:%u ps3_system_bus_device_register failed\n", __func__, __LINE__); - goto fail_device_register; + return result; } =20 pr_debug(" <- %s:%u\n", __func__, __LINE__); return 0; =20 -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; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); =20 p =3D 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; } =20 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; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); =20 p =3D 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; } =20 pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d failed\n", __func__, __LINE__); - return result; } =20 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; =20 + /* + * 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) !=3D 0); + pr_debug(" -> %s:%d\n", __func__, __LINE__); =20 p =3D 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; } =20 pr_debug(" <- %s:%d\n", __func__, __LINE__); return 0; - -fail_device_register: - kfree(p); - pr_debug(" <- %s:%d failed\n", __func__, __LINE__); - return result; } =20 /** diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platfor= ms/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_bu= s_device *dev) pr_debug("%s:%d add %s\n", __func__, __LINE__, dev_name(&dev->core)); =20 result =3D device_register(&dev->core); + if (result) + put_device(&dev->core); return result; } =20 --=20 2.55.0.699.gb54405d56f-goog