Control Flow Integrity (CFI) instrumentation of the kernel noticed that the caller, dev_attr_show(), and the callback, odvp_show(), did not have matching function prototypes, which would cause a CFI exception to be raised. Correct the prototype by using struct device_attribute instead of struct kobj_attribute.
Cc: "Rafael J. Wysocki" rafael@kernel.org Cc: Daniel Lezcano daniel.lezcano@linaro.org Cc: Amit Kucheria amitk@kernel.org Cc: Zhang Rui rui.zhang@intel.com Cc: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Cc: linux-pm@vger.kernel.org Reported-and-tested-by: Joao Moreira joao@overdrivepizza.com Link: https://lore.kernel.org/lkml/067ce8bd4c3968054509831fa2347f4f@overdrivepizza... Fixes: 006f006f1e5c ("thermal/int340x_thermal: Export OEM vendor variables") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook keescook@chromium.org --- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 4954800b9850..d97f496bab9b 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -68,7 +68,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv); struct odvp_attr { int odvp; struct int3400_thermal_priv *priv; - struct kobj_attribute attr; + struct device_attribute attr; };
static ssize_t data_vault_read(struct file *file, struct kobject *kobj, @@ -311,7 +311,7 @@ static int int3400_thermal_get_uuids(struct int3400_thermal_priv *priv) return result; }
-static ssize_t odvp_show(struct kobject *kobj, struct kobj_attribute *attr, +static ssize_t odvp_show(struct device *dev, struct device_attribute *attr, char *buf) { struct odvp_attr *odvp_attr;
On Thu, Apr 21, 2022 at 6:55 PM Kees Cook keescook@chromium.org wrote:
Control Flow Integrity (CFI) instrumentation of the kernel noticed that the caller, dev_attr_show(), and the callback, odvp_show(), did not have matching function prototypes, which would cause a CFI exception to be raised. Correct the prototype by using struct device_attribute instead of struct kobj_attribute.
Cc: "Rafael J. Wysocki" rafael@kernel.org Cc: Daniel Lezcano daniel.lezcano@linaro.org Cc: Amit Kucheria amitk@kernel.org Cc: Zhang Rui rui.zhang@intel.com Cc: Srinivas Pandruvada srinivas.pandruvada@linux.intel.com Cc: linux-pm@vger.kernel.org Reported-and-tested-by: Joao Moreira joao@overdrivepizza.com Link: https://lore.kernel.org/lkml/067ce8bd4c3968054509831fa2347f4f@overdrivepizza... Fixes: 006f006f1e5c ("thermal/int340x_thermal: Export OEM vendor variables") Cc: stable@vger.kernel.org Signed-off-by: Kees Cook keescook@chromium.org
Applied as 5.18-rc material, thanks!
drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c index 4954800b9850..d97f496bab9b 100644 --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -68,7 +68,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv); struct odvp_attr { int odvp; struct int3400_thermal_priv *priv;
struct kobj_attribute attr;
struct device_attribute attr;};
static ssize_t data_vault_read(struct file *file, struct kobject *kobj, @@ -311,7 +311,7 @@ static int int3400_thermal_get_uuids(struct int3400_thermal_priv *priv) return result; }
-static ssize_t odvp_show(struct kobject *kobj, struct kobj_attribute *attr, +static ssize_t odvp_show(struct device *dev, struct device_attribute *attr, char *buf) { struct odvp_attr *odvp_attr; -- 2.32.0
linux-stable-mirror@lists.linaro.org
-
Kees Cook -
Rafael J. Wysocki