Merge tag 'v3.10.71' into update
This is the 3.10.71 stable release
This commit is contained in:
@@ -2546,7 +2546,7 @@ static int kdb_summary(int argc, const char **argv)
|
||||
#define K(x) ((x) << (PAGE_SHIFT - 10))
|
||||
kdb_printf("\nMemTotal: %8lu kB\nMemFree: %8lu kB\n"
|
||||
"Buffers: %8lu kB\n",
|
||||
val.totalram, val.freeram, val.bufferram);
|
||||
K(val.totalram), K(val.freeram), K(val.bufferram));
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
+7
-3
@@ -631,10 +631,14 @@ int ntp_validate_timex(struct timex *txc)
|
||||
if ((txc->modes & ADJ_SETOFFSET) && (!capable(CAP_SYS_TIME)))
|
||||
return -EPERM;
|
||||
|
||||
if (txc->modes & ADJ_FREQUENCY) {
|
||||
if (LONG_MIN / PPM_SCALE > txc->freq)
|
||||
/*
|
||||
* Check for potential multiplication overflows that can
|
||||
* only happen on 64-bit systems:
|
||||
*/
|
||||
if ((txc->modes & ADJ_FREQUENCY) && (BITS_PER_LONG == 64)) {
|
||||
if (LLONG_MIN / PPM_SCALE > txc->freq)
|
||||
return -EINVAL;
|
||||
if (LONG_MAX / PPM_SCALE < txc->freq)
|
||||
if (LLONG_MAX / PPM_SCALE < txc->freq)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
@@ -4786,7 +4786,7 @@ tracing_mark_write(struct file *filp, const char __user *ubuf,
|
||||
*fpos += written;
|
||||
|
||||
out_unlock:
|
||||
for (i = 0; i < nr_pages; i++){
|
||||
for (i = nr_pages - 1; i >= 0; i--) {
|
||||
kunmap_atomic(map_page[i]);
|
||||
put_page(pages[i]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user