mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-04 17:44:14 +08:00
perf/core: Fix bad use of igrab()
As Miklos reported and suggested:
"This pattern repeats two times in trace_uprobe.c and in
kernel/events/core.c as well:
ret = kern_path(filename, LOOKUP_FOLLOW, &path);
if (ret)
goto fail_address_parse;
inode = igrab(d_inode(path.dentry));
path_put(&path);
And it's wrong. You can only hold a reference to the inode if you
have an active ref to the superblock as well (which is normally
through path.mnt) or holding s_umount.
This way unmounting the containing filesystem while the tracepoint is
active will give you the "VFS: Busy inodes after unmount..." message
and a crash when the inode is finally put.
Solution: store path instead of inode."
This patch fixes the issue in kernel/event/core.c.
Reviewed-and-tested-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Reported-by: Miklos Szeredi <miklos@szeredi.hu>
Signed-off-by: Song Liu <songliubraving@fb.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: <kernel-team@fb.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Fixes: 375637bc52
("perf/core: Introduce address range filtering")
Link: http://lkml.kernel.org/r/20180418062907.3210386-2-songliubraving@fb.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
a1150c2022
commit
9511bce9fe
@ -1194,7 +1194,7 @@ static int pt_event_addr_filters_validate(struct list_head *filters)
|
|||||||
filter->action == PERF_ADDR_FILTER_ACTION_START)
|
filter->action == PERF_ADDR_FILTER_ACTION_START)
|
||||||
return -EOPNOTSUPP;
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
if (!filter->inode) {
|
if (!filter->path.dentry) {
|
||||||
if (!valid_kernel_ip(filter->offset))
|
if (!valid_kernel_ip(filter->offset))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
@ -1221,7 +1221,7 @@ static void pt_event_addr_filters_sync(struct perf_event *event)
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
list_for_each_entry(filter, &head->list, entry) {
|
list_for_each_entry(filter, &head->list, entry) {
|
||||||
if (filter->inode && !offs[range]) {
|
if (filter->path.dentry && !offs[range]) {
|
||||||
msr_a = msr_b = 0;
|
msr_a = msr_b = 0;
|
||||||
} else {
|
} else {
|
||||||
/* apply the offset */
|
/* apply the offset */
|
||||||
|
@ -467,7 +467,7 @@ enum perf_addr_filter_action_t {
|
|||||||
*/
|
*/
|
||||||
struct perf_addr_filter {
|
struct perf_addr_filter {
|
||||||
struct list_head entry;
|
struct list_head entry;
|
||||||
struct inode *inode;
|
struct path path;
|
||||||
unsigned long offset;
|
unsigned long offset;
|
||||||
unsigned long size;
|
unsigned long size;
|
||||||
enum perf_addr_filter_action_t action;
|
enum perf_addr_filter_action_t action;
|
||||||
|
@ -6668,7 +6668,7 @@ static void perf_event_addr_filters_exec(struct perf_event *event, void *data)
|
|||||||
|
|
||||||
raw_spin_lock_irqsave(&ifh->lock, flags);
|
raw_spin_lock_irqsave(&ifh->lock, flags);
|
||||||
list_for_each_entry(filter, &ifh->list, entry) {
|
list_for_each_entry(filter, &ifh->list, entry) {
|
||||||
if (filter->inode) {
|
if (filter->path.dentry) {
|
||||||
event->addr_filters_offs[count] = 0;
|
event->addr_filters_offs[count] = 0;
|
||||||
restart++;
|
restart++;
|
||||||
}
|
}
|
||||||
@ -7333,7 +7333,7 @@ static bool perf_addr_filter_match(struct perf_addr_filter *filter,
|
|||||||
struct file *file, unsigned long offset,
|
struct file *file, unsigned long offset,
|
||||||
unsigned long size)
|
unsigned long size)
|
||||||
{
|
{
|
||||||
if (filter->inode != file_inode(file))
|
if (d_inode(filter->path.dentry) != file_inode(file))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if (filter->offset > offset + size)
|
if (filter->offset > offset + size)
|
||||||
@ -8686,8 +8686,7 @@ static void free_filters_list(struct list_head *filters)
|
|||||||
struct perf_addr_filter *filter, *iter;
|
struct perf_addr_filter *filter, *iter;
|
||||||
|
|
||||||
list_for_each_entry_safe(filter, iter, filters, entry) {
|
list_for_each_entry_safe(filter, iter, filters, entry) {
|
||||||
if (filter->inode)
|
path_put(&filter->path);
|
||||||
iput(filter->inode);
|
|
||||||
list_del(&filter->entry);
|
list_del(&filter->entry);
|
||||||
kfree(filter);
|
kfree(filter);
|
||||||
}
|
}
|
||||||
@ -8784,7 +8783,7 @@ static void perf_event_addr_filters_apply(struct perf_event *event)
|
|||||||
* Adjust base offset if the filter is associated to a binary
|
* Adjust base offset if the filter is associated to a binary
|
||||||
* that needs to be mapped:
|
* that needs to be mapped:
|
||||||
*/
|
*/
|
||||||
if (filter->inode)
|
if (filter->path.dentry)
|
||||||
event->addr_filters_offs[count] =
|
event->addr_filters_offs[count] =
|
||||||
perf_addr_filter_apply(filter, mm);
|
perf_addr_filter_apply(filter, mm);
|
||||||
|
|
||||||
@ -8858,7 +8857,6 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr,
|
|||||||
{
|
{
|
||||||
struct perf_addr_filter *filter = NULL;
|
struct perf_addr_filter *filter = NULL;
|
||||||
char *start, *orig, *filename = NULL;
|
char *start, *orig, *filename = NULL;
|
||||||
struct path path;
|
|
||||||
substring_t args[MAX_OPT_ARGS];
|
substring_t args[MAX_OPT_ARGS];
|
||||||
int state = IF_STATE_ACTION, token;
|
int state = IF_STATE_ACTION, token;
|
||||||
unsigned int kernel = 0;
|
unsigned int kernel = 0;
|
||||||
@ -8971,19 +8969,18 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr,
|
|||||||
goto fail_free_name;
|
goto fail_free_name;
|
||||||
|
|
||||||
/* look up the path and grab its inode */
|
/* look up the path and grab its inode */
|
||||||
ret = kern_path(filename, LOOKUP_FOLLOW, &path);
|
ret = kern_path(filename, LOOKUP_FOLLOW,
|
||||||
|
&filter->path);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto fail_free_name;
|
goto fail_free_name;
|
||||||
|
|
||||||
filter->inode = igrab(d_inode(path.dentry));
|
|
||||||
path_put(&path);
|
|
||||||
kfree(filename);
|
kfree(filename);
|
||||||
filename = NULL;
|
filename = NULL;
|
||||||
|
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
if (!filter->inode ||
|
if (!filter->path.dentry ||
|
||||||
!S_ISREG(filter->inode->i_mode))
|
!S_ISREG(d_inode(filter->path.dentry)
|
||||||
/* free_filters_list() will iput() */
|
->i_mode))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
event->addr_filters.nr_file_filters++;
|
event->addr_filters.nr_file_filters++;
|
||||||
|
Loading…
Reference in New Issue
Block a user