From e9b0324eaa1125bbcca28290c88595f8b27960d0 Mon Sep 17 00:00:00 2001 From: Holger Nelson Date: Fri, 12 Jan 2007 02:02:10 +0000 Subject: [PATCH] nbsmi.c Fixed NULL-pointer-dereference in omnibook_handle_fnkey: Pass priv_data instead of NULL to INIT_WORK for kernels<=2.6.19 debian/rules compatibility-fix for Ubuntu: Use DEPMOD="/bin/true" instead of DEPMOD="" during install. --- debian/rules | 2 +- nbsmi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 10854c5..645f18d 100755 --- a/debian/rules +++ b/debian/rules @@ -118,7 +118,7 @@ binary-modules: kdist_config prep-deb-files $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS) # Install the module - $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD="" + $(MAKE) install KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) INSTDIR=extra DEPMOD="/bin/true" dh_installdocs dh_compress diff --git a/nbsmi.c b/nbsmi.c index bef719c..661cbc2 100644 --- a/nbsmi.c +++ b/nbsmi.c @@ -467,7 +467,7 @@ static int register_input_subsystem(struct nbsmi_backend_data *priv_data) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)) INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey); #else - INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey, NULL); + INIT_WORK(&priv_data->fnkey_work, *omnibook_handle_fnkey, priv_data); #endif -- 2.43.5