From: Jakub Kicinski <kuba@kernel.org>
Date: Tue, 14 Nov 2023 04:49:39 +0000 (-0800)
Subject: Revert "ptp: Fixes a null pointer dereference in ptp_ioctl"
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4b3812d90b2c93723adf4b6ce99240d301f7d5f9;p=linux.git

Revert "ptp: Fixes a null pointer dereference in ptp_ioctl"

This reverts commit 8a4f030dbced6fc255cbe67b2d0a129947e18493.

Richard says:

  The test itself is harmless, but keeping it will make people think,
  "oh this pointer can be invalid."

  In fact the core stack ensures that ioctl() can't be invoked after
  release(), otherwise Bad Stuff happens.

Fixes: 8a4f030dbced ("ptp: Fixes a null pointer dereference in ptp_ioctl")
Link: https://lore.kernel.org/all/ZVAf_qdRfDAQYUt-@hoboy.vegasvil.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index e95a6ed130ef4..3f7a747888024 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -176,8 +176,6 @@ long ptp_ioctl(struct posix_clock_context *pccontext, unsigned int cmd,
 	int enable, err = 0;
 
 	tsevq = pccontext->private_clkdata;
-	if (!tsevq)
-		return -EINVAL;
 
 	switch (cmd) {