From patchwork Fri Nov 15 16:04:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Werner Sembach X-Patchwork-Id: 13876529 Received: from mail.tuxedocomputers.com (mail.tuxedocomputers.com [157.90.84.7]) (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 B5D9B2F29; Fri, 15 Nov 2024 16:06:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=157.90.84.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731686800; cv=none; b=oL98N/JmyjoXca5c95yNZZC2u8jfrlx4jx+j8KNqqmEgFMtyMDcFOm5aWoLtDcXrr2Z+UrAKtdH6tdQzMrYlYPJWb9HYYEdtnUm2dubonuyNxIdEMeodJG5lXOow3K/t/6mKpSR0HRbrgffgYVmTcYwlnHWRkAAKX3plNGh8nHU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731686800; c=relaxed/simple; bh=Gxh5SD2o3AZvE1R0wsLp3va2AjRJh+tsS2pl/p1tOOE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Z1MjD1bWeVH6owZ4HC5PjMrrL1kGAweSFx0n9JKmvzN8YAo7Jw4All2uH8VBmUwT6E61xWLlQyVUmZyDk/ciHgV608JdrJ9DP8yE0PKQTBkmv218Mac7mNwL67n8uK5EpybhXeANvubR74YkxH64Uygjt2MutYROP55KxfWLTBo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com; spf=pass smtp.mailfrom=tuxedocomputers.com; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b=gMmlIpA5; arc=none smtp.client-ip=157.90.84.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b="gMmlIpA5" Received: from wse.fritz.box (p5de457db.dip0.t-ipconnect.de [93.228.87.219]) (Authenticated sender: wse@tuxedocomputers.com) by mail.tuxedocomputers.com (Postfix) with ESMTPA id 9E75A2FC005B; Fri, 15 Nov 2024 17:06:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxedocomputers.com; s=default; t=1731686796; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lzzThzBp51NN8jQZ1RQcQJROIdKCMgSV94iAx8zGQzs=; b=gMmlIpA5NP3CvrBYM8b93vqB5R4SrfnGRGNMGHFOedsL0moql3iPc84M8N566HVNrt2BPI gez39CB9mbypR+padSd6Xgnq3TGrlwv7iPnFdYQiXZuRr5zMCrlLFCRTkegM5yk441RY+e iIyyb3I/u9Lc9S0IJX20fD11l9cGkp4= Authentication-Results: mail.tuxedocomputers.com; auth=pass smtp.auth=wse@tuxedocomputers.com smtp.mailfrom=wse@tuxedocomputers.com From: Werner Sembach To: u.kleine-koenig@baylibre.com, mcgrof@kernel.org, petr.pavlu@suse.com, samitolvanen@google.com, da.gomez@samsung.com, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux@leemhuis.info, vv@tuxedocomputers.com, cs@tuxedo.de, wse@tuxedocomputers.com Cc: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Subject: [PATCH v4 1/2] module: Put known GPL offenders in an array Date: Fri, 15 Nov 2024 17:04:36 +0100 Message-ID: <20241115160633.1271757-2-wse@tuxedocomputers.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241115160633.1271757-1-wse@tuxedocomputers.com> References: <20241115160633.1271757-1-wse@tuxedocomputers.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Uwe Kleine-König Instead of repeating the add_taint_module() call for each offender, create an array and loop over that one. This simplifies adding new entries considerably. Signed-off-by: Uwe Kleine-König Reviewed-by: Greg Kroah-Hartman Reviewed-by: Christoph Hellwig Signed-off-by: Werner Sembach --- kernel/module/main.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/kernel/module/main.c b/kernel/module/main.c index 49b9bca9de12f..905d7b60dd709 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2023,11 +2023,20 @@ static int rewrite_section_headers(struct load_info *info, int flags) return 0; } +static const char *module_license_offenders[] = { + /* driverloader was caught wrongly pretending to be under GPL */ + "driverloader", + + /* lve claims to be GPL but upstream won't provide source */ + "lve", +}; + /* * These calls taint the kernel depending certain module circumstances */ static void module_augment_kernel_taints(struct module *mod, struct load_info *info) { int prev_taint = test_taint(TAINT_PROPRIETARY_MODULE); + size_t i; if (!get_modinfo(info, "intree")) { if (!test_taint(TAINT_OOT_MODULE)) @@ -2076,15 +2085,11 @@ static void module_augment_kernel_taints(struct module *mod, struct load_info *i if (strcmp(mod->name, "ndiswrapper") == 0) add_taint(TAINT_PROPRIETARY_MODULE, LOCKDEP_NOW_UNRELIABLE); - /* driverloader was caught wrongly pretending to be under GPL */ - if (strcmp(mod->name, "driverloader") == 0) - add_taint_module(mod, TAINT_PROPRIETARY_MODULE, - LOCKDEP_NOW_UNRELIABLE); - - /* lve claims to be GPL but upstream won't provide source */ - if (strcmp(mod->name, "lve") == 0) - add_taint_module(mod, TAINT_PROPRIETARY_MODULE, - LOCKDEP_NOW_UNRELIABLE); + for (i = 0; i < ARRAY_SIZE(module_license_offenders); ++i) { + if (strcmp(mod->name, module_license_offenders[i]) == 0) + add_taint_module(mod, TAINT_PROPRIETARY_MODULE, + LOCKDEP_NOW_UNRELIABLE); + } if (!prev_taint && test_taint(TAINT_PROPRIETARY_MODULE)) pr_warn("%s: module license taints kernel.\n", mod->name); From patchwork Fri Nov 15 16:04:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Werner Sembach X-Patchwork-Id: 13876531 Received: from mail.tuxedocomputers.com (mail.tuxedocomputers.com [157.90.84.7]) (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 35F4554769; Fri, 15 Nov 2024 16:06:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=157.90.84.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731686802; cv=none; b=YDeNXHIhfqX+qPsnx/mXHbgaoMx6twD7B7/RdRQCJ1Uf2gju1zMx+ChkgVGsJbIE1FaNIr7JjZeE9kryd0WVMLuWiAJm3aE8M/b8VilqKHtoVNZ8BtXVVgXdu4ua6bn9YlHjvTIKSXTagynZoeSvfPK4GP0OvX+yPi1ucS12eQw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731686802; c=relaxed/simple; bh=R0KDEUStn8uHL5AhtfRXsN/yn7hHLoy44foGgfO9tGE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LRvoIGCHIxDZ2JfV5NcLL9KI4DmadM3noHc3Yp4bBzuo8aSGh+DxOniqUNRsEn3b+DJ/XuDPBASF8tNK9VNIpxmK/2hsgahEl5SNBwV8e4+BhtY9/QKKnAHLb2Uuv06tLzwiGhjI0TSQPWXQaYtG0zIu3Bv1H5zx7gELiPIfn24= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com; spf=pass smtp.mailfrom=tuxedocomputers.com; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b=Apz4qd4Q; arc=none smtp.client-ip=157.90.84.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tuxedocomputers.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=tuxedocomputers.com header.i=@tuxedocomputers.com header.b="Apz4qd4Q" Received: from wse.fritz.box (p5de457db.dip0.t-ipconnect.de [93.228.87.219]) (Authenticated sender: wse@tuxedocomputers.com) by mail.tuxedocomputers.com (Postfix) with ESMTPA id A464E2FC005D; Fri, 15 Nov 2024 17:06:37 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tuxedocomputers.com; s=default; t=1731686797; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9UhXDqRv1LyXn2u1yFtgwx0Z25KmuWLbbTBFTIWBTS0=; b=Apz4qd4Q32tFGicq9m2n43639Z02fMc1hFM5n0GQUYHslws317lO/8ysCcRJz7XMzgsB6e UmGzi5hxZ8GWtYZTYYDLxr0Wi3lBparuq1SY/VFDp3JfsRTZba6GvSY8NC/PY91xap9sNu 6CVd4rVGwZFIezhznc+gL2TlN22VPK8= Authentication-Results: mail.tuxedocomputers.com; auth=pass smtp.auth=wse@tuxedocomputers.com smtp.mailfrom=wse@tuxedocomputers.com From: Werner Sembach To: u.kleine-koenig@baylibre.com, mcgrof@kernel.org, petr.pavlu@suse.com, samitolvanen@google.com, da.gomez@samsung.com, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org, linux@leemhuis.info, vv@tuxedocomputers.com, cs@tuxedo.de, wse@tuxedocomputers.com Cc: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Subject: [PATCH v4 2/2] module: Block some modules by TUXEDO from accessing GPL symbols Date: Fri, 15 Nov 2024 17:04:37 +0100 Message-ID: <20241115160633.1271757-3-wse@tuxedocomputers.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241115160633.1271757-1-wse@tuxedocomputers.com> References: <20241115160633.1271757-1-wse@tuxedocomputers.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Uwe Kleine-König TUXEDO has not yet relicensed all modules for GPLv2+ as former contributer need to be contacted that comited code under GPLv3+. So teach the module loader that these modules are proprietary despite their declaration to be GPLv2 compatible until the relicensing is complete. Signed-off-by: Werner Sembach --- kernel/module/main.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kernel/module/main.c b/kernel/module/main.c index 905d7b60dd709..5df995ff0a9d3 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2029,6 +2029,30 @@ static const char *module_license_offenders[] = { /* lve claims to be GPL but upstream won't provide source */ "lve", + + /* + * Tuxedo distributes some of their kernel modules under GPLv3, but + * uses MODULE_LICENSE("GPL") calls. + * See https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers/-/merge_requests/21 + * and https://gitlab.com/tuxedocomputers/development/packages/tuxedo-drivers/-/commit/dd34594ab880ed477bb75725176c3fb9352a07eb + */ + "tuxedo_io", + "tuxedo_nb04_keyboard", + "tuxedo_nb04_wmi_ab", + "tuxedo_nb04_wmi_bs", + "tuxedo_nb04_sensors", + "tuxedo_nb04_power_profiles", + "tuxedo_nb04_kbd_backlight", + "tuxedo_nb05_keyboard", + "tuxedo_nb05_kbd_backlight", + "tuxedo_nb05_power_profiles", + "tuxedo_nb05_ec", + "tuxedo_nb05_sensors", + "tuxedo_nb05_fan_control", + "clevo_wmi", + "tuxedo_keyboard", + "clevo_acpi", + "uniwill_wmi", }; /*