All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Schmidt <mschmidt@redhat.com>
To: Rodolfo Giometti <giometti@enneenne.com>
Cc: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	"Christophe JAILLET" <christophe.jaillet@wanadoo.fr>,
	"Dr. David Alan Gilbert" <linux@treblig.org>,
	"Ma Ke" <make24@iscas.ac.cn>,
	"Andrew Morton" <akpm@linux-foundation.org>,
	"George Spelvin" <linux@horizon.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 4/6] pps: print error in both cdev and dev error paths in pps_register_cdev()
Date: Mon,  2 Dec 2024 17:34:49 +0100	[thread overview]
Message-ID: <20241202163451.1442566-5-mschmidt@redhat.com> (raw)
In-Reply-To: <20241202163451.1442566-1-mschmidt@redhat.com>

For pps, a device_create() failure is just as severe as a cdev_add()
failure. Print the error message in both cases.

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
---
 drivers/pps/pps.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index 92be7815a621..f90ee483d343 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -357,11 +357,9 @@ int pps_register_cdev(struct pps_device *pps)
 	pps->cdev.owner = pps->info.owner;
 
 	err = cdev_add(&pps->cdev, devt, 1);
-	if (err) {
-		pr_err("%s: failed to add char device %d:%d\n",
-				pps->info.name, MAJOR(pps_devt), pps->id);
+	if (err)
 		goto free_idr;
-	}
+
 	pps->dev = device_create(pps_class, pps->info.dev, devt, pps,
 							"pps%d", pps->id);
 	if (IS_ERR(pps->dev)) {
@@ -387,6 +385,8 @@ int pps_register_cdev(struct pps_device *pps)
 free_idr:
 	scoped_guard(mutex, &pps_idr_lock)
 		idr_remove(&pps_idr, pps->id);
+	pr_err("%s: failed to add char device %d:%d\n",
+	       pps->info.name, MAJOR(pps_devt), pps->id);
 	return err;
 }
 
-- 
2.47.0


  parent reply	other threads:[~2024-12-02 16:35 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-12-02 16:34 [PATCH 0/6] pps: fix a UAF and clean up code Michal Schmidt
2024-12-02 16:34 ` [PATCH 1/6] pps: fix cdev use-after-free Michal Schmidt
2024-12-02 16:34 ` [PATCH 2/6] pps: simplify pps_idr_lock locking Michal Schmidt
2024-12-02 16:34 ` [PATCH 3/6] pps: use scoped_guard for pps_idr_lock Michal Schmidt
2024-12-03  9:06   ` Uwe Kleine-König
2024-12-02 16:34 ` Michal Schmidt [this message]
2024-12-02 16:34 ` [PATCH 5/6] pps: embed "dev" in the pps_device Michal Schmidt
2024-12-03  1:02   ` kernel test robot
2024-12-03  2:04   ` kernel test robot
2024-12-02 16:34 ` [PATCH 6/6] pps: use cdev_device_add() Michal Schmidt
2024-12-02 16:56 ` [PATCH 0/6] pps: fix a UAF and clean up code Calvin Owens
2024-12-02 17:58   ` Michal Schmidt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241202163451.1442566-5-mschmidt@redhat.com \
    --to=mschmidt@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=christophe.jaillet@wanadoo.fr \
    --cc=giometti@enneenne.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@horizon.com \
    --cc=linux@treblig.org \
    --cc=make24@iscas.ac.cn \
    --cc=u.kleine-koenig@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.