wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-26 12:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for 2.4.0-test8 kernels

Browse Source 
(patch by Mohammed A. Haque <mhaque@haque.net>)


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@868 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Frodo Looijaard committed 2000-09-06 22:52:00 +00:00
1 parent c0c77680a3
commit 6fa9fe98eb
1 file changed
+19 -11
Download Patch File Download Diff File Expand all files Collapse all files
kernel/sensors.c
+19 -11
View File
@@ -293,7 +293,8 @@ int sensors_proc_chips(ctl_table * ctl, int write, struct file *filp,
client_tbl->procname);
if (buflen + curbufsize > *lenp)
buflen = *lenp - curbufsize;
copy_to_user_ret(buffer, BUF, buflen,-EFAULT);
if(copy_to_user(buffer, BUF, buflen))
return -EFAULT;
curbufsize += buflen;
(char *) buffer += buflen;
}
@@ -322,16 +323,17 @@ int sensors_sysctl_chips(ctl_table * table, int *name, int nlen,
child;
data.sysctl_id = client_tbl->ctl_name;
strcpy(data.name, client_tbl->procname);
copy_to_user_ret(oldval, &data,
if(copy_to_user(oldval, &data,
sizeof(struct
sensors_chips_data),
-EFAULT);
sensors_chips_data)))
return -EFAULT;
(char *) oldval +=
sizeof(struct sensors_chips_data);
nrels++;
}
oldlen = nrels * sizeof(struct sensors_chips_data);
put_user_ret(oldlen, oldlenp,-EFAULT);
if(put_user(oldlen, oldlenp))
return -EFAULT;
}
return ret;
}
@@ -426,15 +428,18 @@ int sensors_sysctl_real(ctl_table * table, int *name, int nlen,
if (nrels * sizeof(long) < oldlen)
oldlen = nrels * sizeof(long);
oldlen = (oldlen / sizeof(long)) * sizeof(long);
copy_to_user_ret(oldval, results, oldlen,-EFAULT);
put_user_ret(oldlen, oldlenp,-EFAULT);
if(copy_to_user(oldval, results, oldlen))
return -EFAULT;
if(put_user(oldlen, oldlenp))
return -EFAULT;
}
if (newval && newlen) {
/* Note the rounding factor! */
newlen -= newlen % sizeof(long);
nrels = newlen / sizeof(long);
copy_from_user_ret(results, newval, newlen,-EFAULT);
if(copy_from_user(results, newval, newlen))
return -EFAULT;
/* Get the new values back to the client */
callback(client, SENSORS_PROC_REAL_WRITE, table->ctl_name,
@@ -575,7 +580,8 @@ int sensors_write_reals(int nrels, void *buffer, int *bufsize,
mag = magnitude;
if (nr != 0) {
put_user_ret(' ', (char *) buffer,-EFAULT);
if(put_user(' ', (char *) buffer))
return -EFAULT;
curbufsize++;
((char *) buffer)++;
}
@@ -615,14 +621,16 @@ int sensors_write_reals(int nrels, void *buffer, int *bufsize,
/* Now copy it to the user-space buffer */
if (buflen + curbufsize > *bufsize)
buflen = *bufsize - curbufsize;
copy_to_user_ret(buffer, BUF, buflen,-EFAULT);
if(copy_to_user(buffer, BUF, buflen))
return -EFAULT;
curbufsize += buflen;
(char *) buffer += buflen;
nr++;
}
if (curbufsize < *bufsize) {
put_user_ret('\n', (char *) buffer,-EFAULT);
if(put_user('\n', (char *) buffer))
return -EFAULT;
curbufsize++;
}
*bufsize = curbufsize;