Commit 01b44ef2 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

counter: Stop using dev_get_drvdata() to get the counter device 



dev_get_drvdata() returns NULL since commit b56346dd ("counter: Use
container_of instead of drvdata to track counter_device") which wrongly
claimed there were no users of drvdata. Convert to container_of() to
fix a null pointer dereference.

Reported-by: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Fixes: b56346dd ("counter: Use container_of instead of drvdata to track counter_device")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Tested-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Link: https://lore.kernel.org/all/20220204082556.370348-1-u.kleine-koenig@pengutronix.de/


Signed-off-by: default avatarWilliam Breathitt Gray <vilhelm.gray@gmail.com>
Link: https://lore.kernel.org/r/4a14311a3b935b62b33e665a97ecaaf2f078228a.1646957732.git.vilhelm.gray@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e57714c

drivers/counter/counter-sysfs.c

+11 −6
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ 


#include "counter-sysfs.h"



static inline struct counter_device *counter_from_dev(struct device *dev)

{

	return container_of(dev, struct counter_device, dev);

}



/**

 * struct counter_attribute - Counter sysfs attribute

 * @dev_attr:	device attribute for sysfs
@@ -90,7 +95,7 @@ static ssize_t counter_comp_u8_show(struct device *dev, 
				    struct device_attribute *attr, char *buf)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	int err;

	u8 data = 0;
@@ -122,7 +127,7 @@ static ssize_t counter_comp_u8_store(struct device *dev, 
				     const char *buf, size_t len)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	int err;

	bool bool_data = 0;

	u8 data = 0;
@@ -158,7 +163,7 @@ static ssize_t counter_comp_u32_show(struct device *dev, 
				     struct device_attribute *attr, char *buf)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	const struct counter_available *const avail = a->comp.priv;

	int err;

	u32 data = 0;
@@ -221,7 +226,7 @@ static ssize_t counter_comp_u32_store(struct device *dev, 
				      const char *buf, size_t len)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	struct counter_count *const count = a->parent;

	struct counter_synapse *const synapse = a->comp.priv;

	const struct counter_available *const avail = a->comp.priv;
@@ -281,7 +286,7 @@ static ssize_t counter_comp_u64_show(struct device *dev, 
				     struct device_attribute *attr, char *buf)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	int err;

	u64 data = 0;
@@ -309,7 +314,7 @@ static ssize_t counter_comp_u64_store(struct device *dev, 
				      const char *buf, size_t len)

{

	const struct counter_attribute *const a = to_counter_attribute(attr);

	struct counter_device *const counter = dev_get_drvdata(dev);

	struct counter_device *const counter = counter_from_dev(dev);

	int err;

	u64 data = 0;