lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Wed, 20 Apr 2022 16:04:00 -0700 From: Kees Cook <keescook@...omium.org> To: Joao Moreira <joao@...rdrivepizza.com> Cc: linux-kernel@...r.kernel.org, linux-hardening@...r.kernel.org, peterz@...radead.org, jpoimboe@...hat.com, andrew.cooper3@...rix.com, samitolvanen@...gle.com, mark.rutland@....com, hjl.tools@...il.com, alyssa.milburn@...ux.intel.com, ndesaulniers@...gle.com, gabriel.gomes@...ux.intel.com, rick.p.edgecombe@...el.com Subject: Re: [RFC PATCH 11/11] driver/int3400_thermal: Fix prototype matching On Wed, Apr 20, 2022 at 03:28:20PM -0700, Joao Moreira wrote: > > Where/why is the mismatch happening? > > Mismatch happens in dev_attr_show from drivers/base/core.c. There, kobject * > is cast to device * before the call, probably because attr is also cast to > device_attribute, which may have a mismatching hook prototype, I guess. Ah-ha, thanks. I think this will fix it, but I haven't tested it: 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; -- Kees Cook
Powered by blists - more mailing lists