From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CBE4C0650F for ; Tue, 30 Jul 2019 06:44:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F17432087F for ; Tue, 30 Jul 2019 06:44:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=hartkopp.net header.i=@hartkopp.net header.b="tWwe2gMG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729105AbfG3GoW (ORCPT ); Tue, 30 Jul 2019 02:44:22 -0400 Received: from mo4-p00-ob.smtp.rzone.de ([85.215.255.22]:9103 "EHLO mo4-p00-ob.smtp.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729093AbfG3GoV (ORCPT ); Tue, 30 Jul 2019 02:44:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1564469059; s=strato-dkim-0002; d=hartkopp.net; h=Message-Id:Date:Subject:Cc:To:From:X-RZG-CLASS-ID:X-RZG-AUTH:From: Subject:Sender; bh=mXr4lLtKtOFMUHxXgePes0yGvqS4pBAElZLekFohMpc=; b=tWwe2gMGFYVlt/5+bIe16nSHvWXVQVNSEVig9tA7xI6/MsU/PmHhlC6jZFOTYCbdCC HaxDLKITgZOrpTZpmrGgLyTar0tJZ+Z9X6AsoEqPxMQwlrYWESLRFrBoO7gmumzN3p0k v57nk/V0zKmMBF67KtMERr1xWvzI72ZK7QQw+E8WUkYuPBcv5hgbTEQnYqZShkdUw7ZW V6eq7Q2J5NLDFt/W/Qmv5h8+Z8ZX0ii7HBaWutThyw3aDGCOkVK8MpPlWbQ7EKLqWlgd ZqjpR+7eF+Y2Px5+MbQrCe711EVj2QztY0P/ndx9/ruu2R0MBgryNTwVWNZpqgmBXd6i BbIQ== X-RZG-AUTH: ":P2MHfkW8eP4Mre39l357AZT/I7AY/7nT2yrDxb8mjGrp7owjzFK3JbFk1mS0lO8DsfULo/u5TWnZ5w==" X-RZG-CLASS-ID: mo00 Received: from silver.lan by smtp.strato.de (RZmta 44.24 DYNA|AUTH) with ESMTPSA id k05d3bv6U6huvx5 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate); Tue, 30 Jul 2019 08:43:56 +0200 (CEST) From: Oliver Hartkopp To: davem@davemloft.net, netdev@vger.kernel.org Cc: linux-can@vger.kernel.org, sfr@canb.auug.org.au, Oliver Hartkopp , kernel test robot Subject: [PATCH net-next v2] can: fix ioctl function removal Date: Tue, 30 Jul 2019 08:43:33 +0200 Message-Id: <20190730064333.1581-1-socketcan@hartkopp.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 60649d4e0af6c26b ("can: remove obsolete empty ioctl() handler") replaced the almost empty can_ioctl() function with sock_no_ioctl() which always returns -EOPNOTSUPP. Even though we don't have any ioctl() functions on socket/network layer we need to return -ENOIOCTLCMD to be able to forward ioctl commands like SIOCGIFINDEX to the network driver layer. This patch fixes the wrong return codes in the CAN network layer protocols. Reported-by: kernel test robot Fixes: 60649d4e0af6c26b ("can: remove obsolete empty ioctl() handler") Signed-off-by: Oliver Hartkopp --- v2: Changed SHA1 tag to be a least 12 digits long net/can/bcm.c | 9 ++++++++- net/can/raw.c | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/net/can/bcm.c b/net/can/bcm.c index 8da986b19d88..bf1d0bbecec8 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1680,6 +1680,13 @@ static int bcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, return size; } +int bcm_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + /* no ioctls for socket layer -> hand it down to NIC layer */ + return -ENOIOCTLCMD; +} + static const struct proto_ops bcm_ops = { .family = PF_CAN, .release = bcm_release, @@ -1689,7 +1696,7 @@ static const struct proto_ops bcm_ops = { .accept = sock_no_accept, .getname = sock_no_getname, .poll = datagram_poll, - .ioctl = sock_no_ioctl, + .ioctl = bcm_sock_no_ioctlcmd, .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, diff --git a/net/can/raw.c b/net/can/raw.c index ff720272f7b7..da386f1fa815 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -837,6 +837,13 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, return size; } +int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd, + unsigned long arg) +{ + /* no ioctls for socket layer -> hand it down to NIC layer */ + return -ENOIOCTLCMD; +} + static const struct proto_ops raw_ops = { .family = PF_CAN, .release = raw_release, @@ -846,7 +853,7 @@ static const struct proto_ops raw_ops = { .accept = sock_no_accept, .getname = raw_getname, .poll = datagram_poll, - .ioctl = sock_no_ioctl, + .ioctl = raw_sock_no_ioctlcmd, .gettstamp = sock_gettstamp, .listen = sock_no_listen, .shutdown = sock_no_shutdown, -- 2.20.1