shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v4.9.165' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

Browse Source 
This is the 4.9.165 stable release
This commit is contained in:
Mauro (mdrjr) Ribeiro
2020-04-07 14:56:52 -03:00
parent 2fcef1193a 1c453afcda
commit fae8d03d01
121 changed files with 914 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/trace/trace.c
View File

@@ -5147,7 +5147,6 @@ out:
return ret;
fail:
kfree(iter->trace);
kfree(iter);
__trace_array_put(tr);
mutex_unlock(&trace_types_lock);

5
kernel/trace/trace_events_hist.c
View File

@@ -871,9 +871,10 @@ static inline void add_to_key(char *compound_key, void *key,
/* ensure NULL-termination */
if (size > key_field->size - 1)
size = key_field->size - 1;
}
memcpy(compound_key + key_field->offset, key, size);
strncpy(compound_key + key_field->offset, (char *)key, size);
} else
memcpy(compound_key + key_field->offset, key, size);
}
static void event_hist_trigger(struct event_trigger_data *data, void *rec)