Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Sender: Guenter Roeck <groeck7@gmail.com>
From:   Guenter Roeck <linux@roeck-us.net>
To:     Derek Kiernan <derek.kiernan@xilinx.com>
Cc:     Dragan Cvetic <dragan.cvetic@xilinx.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Michal Simek <michal.simek@xilinx.com>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        Guenter Roeck <linux@roeck-us.net>
Subject: [RFC PATCH] misc: xilinx-sdfec: Check if file->private_data is NULL
Date:   Thu, 20 May 2021 10:01:50 -0700
Message-Id: <20210520170150.1615956-1-linux@roeck-us.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

container_of() only returns NULL if the passed pointer is NULL _and_
the embedded element is the first element of the structure. Even if that
is the case, testing against it is misleading and possibly dangerous
because the position of the embedded element may change. Explicitly
check if the parameter is NULL and bail out if so instead of checking
the result of container_of().

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
RFC:

The NULL check in the poll function is likely unnecessary. Interestingly,
there is no NULL check in the ioctl function, even though there is a
similar container_of() in that function. However, I do not feel
comfortable enough to change the functionality of this code and drop
the check entirely.

 drivers/misc/xilinx_sdfec.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
index 23c8448a9c3b..0a3721d31dea 100644
--- a/drivers/misc/xilinx_sdfec.c
+++ b/drivers/misc/xilinx_sdfec.c
@@ -1011,11 +1011,11 @@ static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
 	__poll_t mask = 0;
 	struct xsdfec_dev *xsdfec;
 
-	xsdfec = container_of(file->private_data, struct xsdfec_dev, miscdev);
-
-	if (!xsdfec)
+	if (!file->private_data)
 		return EPOLLNVAL | EPOLLHUP;
 
+	xsdfec = container_of(file->private_data, struct xsdfec_dev, miscdev);
+
 	poll_wait(file, &xsdfec->waitq, wait);
 
 	/* XSDFEC ISR detected an error */
-- 
2.25.1