From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 536A15C82 for ; Mon, 12 Sep 2022 21:45:43 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id k126-20020a253d84000000b0068bb342010dso8352642yba.1 for ; Mon, 12 Sep 2022 14:45:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:from:subject:message-id:mime-version:date:from:to:cc:subject :date; bh=+OAWo6obQA5uOmNqmxhrbmYCLRgr4K4PfskcsDIp7Sk=; b=FX70JtZctz087sDCP5WjmRQG8blEx7SV2OF/xqXqlxZ8xRvnNeAnSI5jvtTv6NxsSA vtE95GbpjKQHMakctvkQ/SqVsGI5fpepp3Y2QWcI8yCwmS5kd7Zk/Qj40rVhfhxKkRLw SZqA4duhEDWn6aNoRzzJ50Cx9TiIjd2sHKRx/8W7a7sVC6hBwehwQQibCwmuDO0XtN2A JPo+q8qwlkb74eyW82VZosMZ+lcWeiFnjEkyxEa9bwUzxzKijwyIFdggnkYByg9FI8hF 9EdHBX/rOMwuJ0LHTPl5hCimKfAjjhT+fglGRi2z1JqHn0yJ8uvGGjdgzBgWdcCh/9k3 2yVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date; bh=+OAWo6obQA5uOmNqmxhrbmYCLRgr4K4PfskcsDIp7Sk=; b=c/nfble235+PiosDgO5epLyFZkZ4dL6fMChm8gKIxXuU7ermqtTnxWzdFm9cSTstEw k8LprNVGMo9+MVkVE7veKZl3NRA6VFWVkw639JkCdaHR/2T7fBoo4EBbHN8GNZSNGlQ0 PP2CJw7jSfzqnRCULfllYmxf1dWhWeIvFTm31cNIa0lC547EHMqkoMjzlzuI8grjVR/z NfTWmLIFKlDYs3QjlYEpR/sO6qiq0/MOmMW1MYGomQI0ht6dceglHFJPxhkXo1IYJ2Eq CrYKX8hiMiccgNVFMsAEchKLRuITxjrEBwjppan2FUnksHQD3bL/mCLNKDNWeXo4AT0q KoWg== X-Gm-Message-State: ACgBeo3KdXwofjiMa6Iry/ICm15nLIzA1V3AbCzON5YdG0vg2mtanw4Y YrdeWn8DPj440myvg6iRWD5xekHitQ== X-Google-Smtp-Source: AA6agR4i1CEBghsid1Cfen84EGO8TUwI5lM4bZGhTEE5HnlAqt4yRYaPg+UVJjqLn9wyY4D6qL1/DESC1w== X-Received: from nhuck.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:39cc]) (user=nhuck job=sendgmr) by 2002:a25:230d:0:b0:6a9:1d4d:6594 with SMTP id j13-20020a25230d000000b006a91d4d6594mr24540953ybj.616.1663019142446; Mon, 12 Sep 2022 14:45:42 -0700 (PDT) Date: Mon, 12 Sep 2022 14:45:32 -0700 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220912214535.929116-1-nhuck@google.com> Subject: [PATCH] staging: r8188eu: Fix return type of rtw_xmit_entry From: Nathan Huckleberry Cc: Nathan Huckleberry , Dan Carpenter , llvm@lists.linux.dev, Larry Finger , Phillip Potter , Pavel Skripkin , Greg Kroah-Hartman , Nathan Chancellor , Nick Desaulniers , Tom Rix , Ivan Safonov , Nam Cao , Saurav Girepunje , Vihas Makwana , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The ndo_start_xmit field in net_device_ops is expected to be of type netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev). The mismatched return type breaks forward edge kCFI since the underlying function definition does not match the function hook definition. The return type of rtw_xmit_entry should be changed from int to netdev_tx_t. Reported-by: Dan Carpenter Link: https://github.com/ClangBuiltLinux/linux/issues/1703 Cc: llvm@lists.linux.dev Signed-off-by: Nathan Huckleberry --- drivers/staging/r8188eu/os_dep/xmit_linux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/xmit_linux.c b/drivers/staging/r8188eu/os_dep/xmit_linux.c index 91a1e4e3219a..0b04010d6d82 100644 --- a/drivers/staging/r8188eu/os_dep/xmit_linux.c +++ b/drivers/staging/r8188eu/os_dep/xmit_linux.c @@ -198,7 +198,7 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb) return true; } -int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) +netdev_tx_t rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) { struct adapter *padapter = (struct adapter *)rtw_netdev_priv(pnetdev); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; @@ -233,5 +233,5 @@ int rtw_xmit_entry(struct sk_buff *pkt, struct net_device *pnetdev) exit: - return 0; + return NETDEV_TX_OK; } -- 2.37.2.789.g6183377224-goog