Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1093153iob; Wed, 4 May 2022 14:33:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwJhux98n56I2ADu/70n14aOPrTFcOTS2jWMOtc4FXB+p/JiMQk2AKtDIExRGCdZgZlq6OS X-Received: by 2002:a17:90b:4c0a:b0:1d5:2e1d:ec6 with SMTP id na10-20020a17090b4c0a00b001d52e1d0ec6mr1906049pjb.64.1651700029037; Wed, 04 May 2022 14:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651700029; cv=none; d=google.com; s=arc-20160816; b=aTtMZ5Y0LREaa9twd57Qgrtze5l4e/ILA2XP0XbV1ljAkl9Pe63KSHKnxk6u6lFV0t wNL1nDOt6ELFezDRqZV9y3ZFhPu/b9WoxuODWT6EdVqyJCeS8T4mxs7j7SLArqZPRM6l oOFtTcteJ5h+G+md01wMBbcRCytotBBUkIz2IWcsAXabaey8bRS8qrA0vZsT5CrU/zso WedwfZeQ4qtjOpi6VEgq8S/Tm8qQievOrcYDbJ8+1gOjzE7e/yN1AL0kskwNAuwNYPAi 3NjGGRZa01qejE/bRBPWIWzqyeUqsxokCsizKntPaM8xY3ZRnv+fax4QFAVjGq1p7K1C wxng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OEQpTWzbJGUXAso7yDaIuHoZIc1A0CSIA+5ZDBVXDCk=; b=qfYpLH6aeVzsUsO/xiFa/jjrmzHZVvrZud+EebNUb5pe9ov71ykAbn0kaNfKn/JHLb QoGrbZO2b8PR34Bw7Cvw7qiAV7aSUQ4t1GjFL23w5oytMC5uvMhjx2vxfEKoHKG5DKoP G6qpYx1nmZ/cXvwi75+Ahr0BKnQgGkK8Im2HMrSEbwHRpZTM/dmUkdtDzjLqZwhLQoQ2 DMA4AtgQGdulOBQbXOaD8OXfQtKmOJySNd7TARSz7gUKnQWXbGgteoAz3XYwYMq/oUZC WBBYPVrAH2qzYs+mB46b5x7p2YReQze+EKCqMslx/RUUUHxuswmzUD/bppbpCcJ2GeFb y0Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wsc7E1aT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 62-20020a630241000000b003c15f7ec8c1si9200944pgc.309.2022.05.04.14.33.34; Wed, 04 May 2022 14:33:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wsc7E1aT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376361AbiEDRyS (ORCPT + 99 others); Wed, 4 May 2022 13:54:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55466 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357709AbiEDRPL (ORCPT ); Wed, 4 May 2022 13:15:11 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8DD455371; Wed, 4 May 2022 09:58:54 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2ECFDB827A5; Wed, 4 May 2022 16:58:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD3FFC385AF; Wed, 4 May 2022 16:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683532; bh=nGLJ71aZM7M+usue7fy/bT1qAY3btYDEdT4Yeh0Ev5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wsc7E1aTnLV+J/2b4PLxM8vRucXwApLovOJI9CvzKXSYDfTGmtu3jSJ/EnTKZOiFu Q8R5datEYemLur3UlUJY++YGJ6jZwuER16bKMtTiG0V+NndRnfhRC3YSWXTt85bdey ZIOsdOBpKu+INL6l4uxXV4fv0M3QW/cACfm80qEI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kees Cook , "Rafael J. Wysocki" , Joao Moreira Subject: [PATCH 5.17 190/225] thermal: int340x: Fix attr.show callback prototype Date: Wed, 4 May 2022 18:47:08 +0200 Message-Id: <20220504153127.239181450@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kees Cook commit d0f6cfb2bd165b0aa307750e07e03420859bd554 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 Link: https://lore.kernel.org/lkml/067ce8bd4c3968054509831fa2347f4f@overdrivepizza.com/ Fixes: 006f006f1e5c ("thermal/int340x_thermal: Export OEM vendor variables") Cc: 5.8+ # 5.8+ Signed-off-by: Kees Cook Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/intel/int340x_thermal/int3400_thermal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/thermal/intel/int340x_thermal/int3400_thermal.c +++ b/drivers/thermal/intel/int340x_thermal/int3400_thermal.c @@ -67,7 +67,7 @@ static int evaluate_odvp(struct int3400_ 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, @@ -271,7 +271,7 @@ static int int3400_thermal_run_osc(acpi_ 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;