git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
V4L/DVB (8415): gspca: Infinite loop in i2c_w() of etoms.
[pandora-kernel.git]
/
mm
/
util.c
diff --git
a/mm/util.c
b/mm/util.c
index
5f64026
..
8f18683
100644
(file)
--- a/
mm/util.c
+++ b/
mm/util.c
@@
-95,8
+95,8
@@
void *krealloc(const void *p, size_t new_size, gfp_t flags)
return (void *)p;
ret = kmalloc_track_caller(new_size, flags);
- if (ret) {
- memcpy(ret, p,
min(new_size, ks)
);
+ if (ret
&& p
) {
+ memcpy(ret, p,
ks
);
kfree(p);
}
return ret;