LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2.6.25] module: allow ndiswrapper to use GPL-only symbols
@ 2008-02-28 22:11 Pavel Roskin
  2008-02-28 23:25 ` Linus Torvalds
  0 siblings, 1 reply; 39+ messages in thread
From: Pavel Roskin @ 2008-02-28 22:11 UTC (permalink / raw)
  To: linux-kernel, Linus Torvalds; +Cc: Jon Masters, Rusty Russell

A change after 2.6.24 broke ndiswrapper by accidentally removing its
access to GPL-only symbols.  Revert that change and add comments about
the reasons why ndiswrapper and driverloader are treated in a special
way.

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

 kernel/module.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


diff --git a/kernel/module.c b/kernel/module.c
index 901cd6a..a11f523 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1933,8 +1933,15 @@ static struct module *load_module(void __user *umod,
 	/* Set up license info based on the info section */
 	set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
 
+	/*
+	 * ndiswrapper is under GPL by itself, but loads proprietary modules.
+	 * Don't use add_taint_module(), as it would prevent ndiswrapper from
+	 * using GPL-only symbols it needs.
+	 */
 	if (strcmp(mod->name, "ndiswrapper") == 0)
-		add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+		add_taint(TAINT_PROPRIETARY_MODULE);
+
+	/* driverloader was caught wrongly pretending to be under GPL */
 	if (strcmp(mod->name, "driverloader") == 0)
 		add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
 

-- 
Regards,
Pavel Roskin

^ permalink raw reply	[flat|nested] 39+ messages in thread

end of thread, other threads:[~2008-03-06 14:57 UTC | newest]

Thread overview: 39+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-28 22:11 [PATCH 2.6.25] module: allow ndiswrapper to use GPL-only symbols Pavel Roskin
2008-02-28 23:25 ` Linus Torvalds
2008-02-29  6:20   ` Pavel Roskin
2008-02-29 16:08     ` Linus Torvalds
2008-02-29 16:54       ` Chris Friesen
2008-02-29 17:06         ` Linus Torvalds
2008-02-29 17:59           ` Chris Friesen
2008-03-06 14:56         ` David Woodhouse
2008-02-29 16:59       ` Zan Lynx
2008-02-29 17:07         ` Linus Torvalds
2008-02-29 17:20           ` Pavel Roskin
2008-02-29 17:33             ` Linus Torvalds
2008-02-29 19:39               ` Pavel Roskin
2008-02-29 19:53                 ` Linus Torvalds
2008-02-29 20:08                   ` Pavel Roskin
2008-02-29 20:28                     ` Linus Torvalds
2008-02-29 21:13                       ` Pavel Roskin
2008-02-29 20:17                 ` John W. Linville
2008-02-29 20:40                   ` David Newall
2008-02-29 20:59                     ` Pavel Roskin
2008-02-29 21:08                       ` David Newall
2008-02-29 22:17                         ` Pavel Roskin
2008-03-01  8:15                           ` David Newall
2008-02-29 20:44                   ` Pavel Roskin
2008-02-29 21:15                 ` Ingo Molnar
2008-02-29 22:31                   ` Pavel Roskin
2008-03-03 10:57                     ` Ingo Molnar
2008-03-04  5:37                       ` Pavel Roskin
2008-03-04 12:57                         ` Ingo Molnar
2008-03-04 17:19                           ` Linus Torvalds
2008-03-04 17:38                             ` Greg KH
2008-03-04 17:45                             ` Pavel Roskin
2008-03-04 21:20                               ` Ingo Molnar
2008-03-04 23:23                                 ` Pavel Roskin
2008-03-04 20:51                             ` Ingo Molnar
2008-03-04 23:25                               ` Jiri Kosina
2008-03-05 13:21                                 ` Ingo Molnar
2008-02-29 17:18         ` Jon Masters
2008-02-29 21:55           ` Adrian Bunk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).