From owner-dev-commits-src-all@freebsd.org Fri Oct 1 09:26:20 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BD9776A9BC9; Fri, 1 Oct 2021 09:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HLPqw4tP6z3PYf; Fri, 1 Oct 2021 09:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 88CCB1CC35; Fri, 1 Oct 2021 09:26:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1919QKQ9003843; Fri, 1 Oct 2021 09:26:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1919QK5Z003842; Fri, 1 Oct 2021 09:26:20 GMT (envelope-from git) Date: Fri, 1 Oct 2021 09:26:20 GMT Message-Id: <202110010926.1919QK5Z003842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: a75400c5addf - main - modules: felix: Remove etherswitch_if.c from Makefile MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a75400c5addf905edea7897c5071904556a691f2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Oct 2021 09:26:20 -0000 The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=a75400c5addf905edea7897c5071904556a691f2 commit a75400c5addf905edea7897c5071904556a691f2 Author: Kornel Duleba AuthorDate: 2021-09-30 11:06:34 +0000 Commit: Wojciech Macek CommitDate: 2021-10-01 09:24:08 +0000 modules: felix: Remove etherswitch_if.c from Makefile Having it included confuses KOBJOPLOOKUP resulting in kobj_error_method being called instead of a devmethod from the switch driver. That in turn returns ENXIO which was treated as a pointer and dereferenced by etherswitch ioctl logic causing the kernel to panic. Fixes: b542c9e42ba4 (modules: felix: Add needed dependencies) --- sys/modules/felix/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/modules/felix/Makefile b/sys/modules/felix/Makefile index a9eac1080c91..8f30a0e72a45 100644 --- a/sys/modules/felix/Makefile +++ b/sys/modules/felix/Makefile @@ -29,7 +29,7 @@ .PATH: ${SRCTOP}/sys/dev/etherswitch/felix KMOD = felix -SRCS = felix.c etherswitch_if.c etherswitch_if.h -SRCS += bus_if.h device_if.h miibus_if.h ofw_bus_if.h pci_if.h +SRCS = felix.c +SRCS += bus_if.h device_if.h etherswitch_if.h miibus_if.h ofw_bus_if.h pci_if.h .include