Commit d0f6cfb2 authored by Kees Cook's avatar Kees Cook Committed by Rafael J. Wysocki
Browse files

thermal: int340x: Fix attr.show callback prototype 



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: default avatarJoao Moreira <joao@overdrivepizza.com>
Link: https://lore.kernel.org/lkml/067ce8bd4c3968054509831fa2347f4f@overdrivepizza.com/


Fixes: 006f006f ("thermal/int340x_thermal: Export OEM vendor variables")
Cc: 5.8+ <stable@vger.kernel.org> # 5.8+
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b2d229d4

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -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;