From patchwork Wed Nov 2 16:02:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Chancellor X-Patchwork-Id: 14319 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a40e:b0:83:7221:86ba with SMTP id ck14csp58249dyb; Wed, 2 Nov 2022 09:05:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FTLtefXKofI3q2QaYq+t+PvRDj6otL9TIHe9n6fENE9r80rt2s/4r7Evvhv1+khulKWIy X-Received: by 2002:a17:907:6e1a:b0:7ad:ba0b:538c with SMTP id sd26-20020a1709076e1a00b007adba0b538cmr21628859ejc.111.1667405145297; Wed, 02 Nov 2022 09:05:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667405145; cv=none; d=google.com; s=arc-20160816; b=uwuWLIhw/1DDlP2l4P64eqRc/XGHPEpvYI78NyqJn4XrBIwsxE0qQQHSH09di0zZil +IA2Z08jbXIlm6KK1ohjYOfYRsW6Arkejz50vdVQeEJtq5rKk6rI/zic/e8LzeAgn1Xe s3FKkAUddlbuB1H8QvbODPLxOZ8G3YtJxiEQ5jiCg9psZvRNGmsh7Il6zz5pf3BdFLbv SozGQaqtCgy1/h7fPSr+sshXyu98LbJxE6DGn3Ivix6Xu0OZpvh9/l17erX7OEKcFky7 aMA/V60h3exJlar5I2ajDj3pd0K3DEtKnNPygqJ1Sxt4DyU/rvGn+VrdE/7lbG0eHFsg my+g== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=NfZByxBA8iIQ0xpMeVtlRtuXCK1/O8zUDGVYm5/oBtg=; b=vsB8X0RIitSgLsEHeQt647YRf5amKPfwbceR3VIZXDwcV1N0do+6BMpI15TDEL0S8D NHDXQ8c4KJgGxiXkDzMVqrehxE+6BGBtJiJTiuEOHR+YCKFC+boc00txappuz/Ns1Xkg wbrw0Mq8gnoOktwnbyYuPS5pnxPdOoZEuPqaEH6VdArlqSaQuEAc9bGDKkgDN1riTvxM zXtu10KzGkrOBvaEMSWnNS2TVdHMup4EEyaAoJ36sWnqeNmYgbTqpvtyanqU+Jx4913v XK9TsQnxW5FHHDHOsJWegxkMA91g5rsQMdpfxRQa82Rapgaf6YuxJlYOfwH3vXM3w9s6 gX+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="ittyk1S/"; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d4-20020aa7c1c4000000b00461a7962c26si14623398edp.527.2022.11.02.09.05.17; Wed, 02 Nov 2022 09:05:45 -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=@kernel.org header.s=k20201202 header.b="ittyk1S/"; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231168AbiKBQDv (ORCPT + 99 others); Wed, 2 Nov 2022 12:03:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231280AbiKBQDL (ORCPT ); Wed, 2 Nov 2022 12:03:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67FF42C662 for ; Wed, 2 Nov 2022 09:02:49 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 05CD1615A7 for ; Wed, 2 Nov 2022 16:02:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D45C7C433D6; Wed, 2 Nov 2022 16:02:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667404968; bh=cE8J5RGm2uXZylqKvBQig6sjIS1V9gX8rCNrulN+Ugw=; h=From:To:Cc:Subject:Date:From; b=ittyk1S/pCbtLTEwA1WG8/9J37IKVTfkkHUoRwy/OZQP0pwtJzF3i9d5AAjR/8oUm PcpkNLB74BuQU+LY8wpeaRHJut7XJEwD0uCGYnlEXzRo8QeX8lU0zanAIo6g6J2WVj Gx3qL4yx6kKICEMwcriT/DJjQpkp/SzgLEd+Xtz9ZvfMJm26yV4QvwNGR4MMGwiUz2 RccoJAuM9VEKs0e4nZu7E0bBszQXyDjUd0ft3NLqCkR1GSh/zEOjVvTHaylUkqkNev UffjNZAs1mSWO9iol1yVVEjtzEvqRu7FBLOF0r0yl0a/sVHrZkNQ7qot+wf4zLifU1 BCS1bL3BJiFkQ== From: Nathan Chancellor To: Sebastian Reichel Cc: Nick Desaulniers , Tom Rix , Kees Cook , Sami Tolvanen , llvm@lists.linux.dev, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Nathan Chancellor Subject: [PATCH] HSI: ssi_protocol: Fix return type of ssip_pn_xmit() Date: Wed, 2 Nov 2022 09:02:33 -0700 Message-Id: <20221102160233.4042756-1-nathan@kernel.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 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 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748401017636109044?= X-GMAIL-MSGID: =?utf-8?q?1748401017636109044?= With clang's kernel control flow integrity (kCFI, CONFIG_CFI_CLANG), indirect call targets are validated against the expected function pointer prototype to make sure the call target is valid to help mitigate ROP attacks. If they are not identical, there is a failure at run time, which manifests as either a kernel panic or thread getting killed. A proposed warning in clang aims to catch these at compile time, which reveals: drivers/hsi/clients/ssi_protocol.c:1053:20: error: incompatible function pointer types initializing 'netdev_tx_t (*)(struct sk_buff *, struct net_device *)' (aka 'enum netdev_tx (*)(struct sk_buff *, struct net_device *)') with an expression of type 'int (struct sk_buff *, struct net_device *)' [-Werror,-Wincompatible-function-pointer-types-strict] .ndo_start_xmit = ssip_pn_xmit, ^~~~~~~~~~~~ 1 error generated. ->ndo_start_xmit() in 'struct net_device_ops' expects a return type of 'netdev_tx_t', not 'int'. Adjust the return type of ssip_pn_xmit() to match the prototype's to resolve the warning and CFI failure. Additionally, use the enum 'NETDEV_TX_OK' instead of a raw '0' for the return value of ssip_pn_xmit(). Link: https://github.com/ClangBuiltLinux/linux/issues/1750 Signed-off-by: Nathan Chancellor Reviewed-by: Kees Cook --- drivers/hsi/clients/ssi_protocol.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780 diff --git a/drivers/hsi/clients/ssi_protocol.c b/drivers/hsi/clients/ssi_protocol.c index 274ad8443f8c..38e572faff43 100644 --- a/drivers/hsi/clients/ssi_protocol.c +++ b/drivers/hsi/clients/ssi_protocol.c @@ -968,7 +968,7 @@ static void ssip_xmit_work(struct work_struct *work) ssip_xmit(cl); } -static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) +static netdev_tx_t ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) { struct hsi_client *cl = to_hsi_client(dev->dev.parent); struct ssi_protocol *ssi = hsi_client_drvdata(cl); @@ -1027,7 +1027,7 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; - return 0; + return NETDEV_TX_OK; drop2: hsi_free_msg(msg); drop: @@ -1035,7 +1035,7 @@ static int ssip_pn_xmit(struct sk_buff *skb, struct net_device *dev) inc_dropped: dev->stats.tx_dropped++; - return 0; + return NETDEV_TX_OK; } /* CMT reset event handler */