forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

thermal: int340x: Fix attr.show callback prototype

Browse source 
commit d0f6cfb2bd upstream.

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.

Reported-and-tested-by: Joao Moreira <joao@overdrivepizza.com>
Link: https://lore.kernel.org/lkml/067ce8bd4c3968054509831fa2347f4f@overdrivepizza.com/
Fixes: 006f006f1e ("thermal/int340x_thermal: Export OEM vendor variables")
Cc: 5.8+ <stable@vger.kernel.org> # 5.8+
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook 2022-04-21 09:55:04 -07:00 • committed by Greg Kroah-Hartman
commit 795afbe8b4
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
View file

@ -67,7 +67,7 @@ static int evaluate_odvp(struct int3400_thermal_priv *priv);
struct odvp_attr { struct odvp_attr {
int odvp; int odvp;
struct int3400_thermal_priv *priv; 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, static ssize_t data_vault_read(struct file *file, struct kobject *kobj,
@ -269,7 +269,7 @@ static int int3400_thermal_run_osc(acpi_handle handle,
return result; 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) char *buf)
{ {
struct odvp_attr *odvp_attr; struct odvp_attr *odvp_attr;