gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add type casting to the argument of getlong_user()

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-03-23 18:31:17 +09:00
parent e74eb1dd51
commit f92cac7751
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/string.c
View File

@@ -279,7 +279,7 @@ int flatten_strings_from_user(int nr_strings, char *first, char **strings, char
/* How many strings do we have? */ /* How many strings do we have? */
if (nr_strings == -1) { if (nr_strings == -1) {
for (nr_strings = 0; (r = getlong_user(strings + nr_strings)) > 0; ++nr_strings); for (nr_strings = 0; (r = getlong_user((void *)(strings + nr_strings))) > 0; ++nr_strings);
if(r < 0) if(r < 0)
return r; return r;
} }
@@ -295,7 +295,7 @@ int flatten_strings_from_user(int nr_strings, char *first, char **strings, char
} }
for (string_i = 0; string_i < nr_strings; ++string_i) { for (string_i = 0; string_i < nr_strings; ++string_i) {
char *userp = (char *)getlong_user(strings + string_i); char *userp = (char *)getlong_user((void *)(strings + string_i));
int len = strlen_user(userp); int len = strlen_user(userp);
if(len < 0) if(len < 0)
@@ -326,7 +326,7 @@ int flatten_strings_from_user(int nr_strings, char *first, char **strings, char
} }
for (string_i = 0; string_i < nr_strings; ++string_i) { for (string_i = 0; string_i < nr_strings; ++string_i) {
char *userp = (char *)getlong_user(strings + string_i); char *userp = (char *)getlong_user((void *)(strings + string_i));
_flat[n++] = p - (char *)_flat; _flat[n++] = p - (char *)_flat;
strcpy_from_user(p, userp); strcpy_from_user(p, userp);
p = strchr(p, '\0') + 1; p = strchr(p, '\0') + 1;