From 7fed66e4966c517d219877f9e32738698195e74a Mon Sep 17 00:00:00 2001 From: turbocat Date: Thu, 19 Aug 2021 20:26:35 +0000 Subject: [PATCH] k10temp: - fixed crash when there was no device. git-svn-id: svn://kolibrios.org@9144 a494cfbc-eb01-0410-851d-a64ba20cac60 --- drivers/sensors/k10temp/k10temp.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/sensors/k10temp/k10temp.c b/drivers/sensors/k10temp/k10temp.c index 347162cf3c..94b74a601f 100644 --- a/drivers/sensors/k10temp/k10temp.c +++ b/drivers/sensors/k10temp/k10temp.c @@ -28,7 +28,9 @@ #include struct cpuinfo_x86 boot_cpu_data; -bool force; +extern void init_amd_nbs(void); + +#define KERNEL_SPACE 0x80000000 /* CPUID function 0x80000001, ebx */ #define CPUID_PKGTYPE_MASK GENMASK(31, 28) @@ -166,7 +168,6 @@ long get_raw_temp(struct k10temp_data *data) { u32 regval; long temp; - //printk("b30\n"); data->read_tempreg(data->pdev, ®val); temp = (regval >> ZEN_CUR_TEMP_SHIFT) * 125; if (regval & data->temp_adjust_mask) @@ -534,19 +535,21 @@ void read_all_info(struct device* dev){ } int __stdcall service_proc(ioctl_t *my_ctl){ - if(!my_ctl || !my_ctl->output){ - return 1; + if(!my_ctl || !my_ctl->output || (int)my_ctl->output>=KERNEL_SPACE-sizeof(k10temp_out)){ + printk("k10temp: Bad address for writing data!\n"); + return 0; } + read_all_info(&k10temp_device); + if(my_ctl->out_size == sizeof(k10temp_out)){ memcpy(my_ctl->output, &k10temp_out, sizeof(k10temp_out)); return 0; } + printk("k10temp: Invalid buffer length!\n"); return 1; } -extern void init_amd_nbs(void); - uint32_t drvEntry(int action, char *cmdline){ if(action != 1){ return 0; @@ -560,14 +563,14 @@ uint32_t drvEntry(int action, char *cmdline){ err = enum_pci_devices(); if(unlikely(err != 0)) { printk("k10temp: Device enumeration failed!\n"); - return -1; + return 0; } k10temp_id = find_pci_device(&device, k10temp_id_table); if(unlikely(k10temp_id == NULL)){ printk("k10temp: Device not found!\n"); - return -ENODEV; + return 0; } init_amd_nbs();