mm/damon: Hide unnecessary information disclosures
Subsystems (3)
SeongJae Park
maintainercover mm/damon: Hide unnecessary information disclosures
DAMON is exposing some unnecessary information including kernel pointer in kernel log and tracepoint. This patchset hides such information. The first patch is only for a trivial cleanup, though.
SeongJae Park (4):
mm/damon/dbgfs: Remove a unnecessary variable mm/damon/vaddr: Use pr_debug() for damon_va_three_regions() failure
logging
mm/damon/vaddr: Hide kernel pointer from damon_va_three_regions()
failure log
mm/damon: Hide kernel pointer from tracepoint event
include/trace/events/damon.h | 8 ++++---- mm/damon/core.c | 4 +++- mm/damon/dbgfs.c | 5 ++--- mm/damon/vaddr.c | 10 ++++++++-- 4 files changed, 17 insertions(+), 10 deletions(-)
Signature · 1 line
2.17.1
SeongJae Park
maintainerPATCH 1/4 mm/damon/dbgfs: Remove a unnecessary variable
This commit removes a unnecessarily used variable in dbgfs_target_ids_write().
--- mm/damon/dbgfs.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
mm/damon/dbgfs.c +2 -3
@@ -364,7 +364,7 @@ static ssize_t dbgfs_target_ids_write(struct file *file,struct damon_ctx *ctx = file->private_data;struct damon_target *t, *next_t;bool id_is_pid = true; -char *kbuf, *nrs; +char *kbuf;unsigned long *targets;ssize_t nr_targets;ssize_t ret;
@@ -374,14 +374,13 @@ static ssize_t dbgfs_target_ids_write(struct file *file,if (IS_ERR (kbuf))return PTR_ERR (kbuf); - nrs = kbuf;if (!strncmp (kbuf,"paddr\n" , count)) { id_is_pid = false;/* target id is meaningless here, but we set it just for fun */ scnprintf (kbuf, count,"42 " ); } - targets =str_to_target_ids (nrs, count, &nr_targets); + targets =str_to_target_ids (kbuf, count, &nr_targets);if (!targets) { ret = -ENOMEM ; goto out;
Signature · 1 line
2.17.1
SeongJae Park
maintainerPATCH 2/4 mm/damon/vaddr: Use pr_debug() for damon_va_three_regions() failure logging
In reply to SeongJae ParkFailure of 'damon_va_three_regions()' is logged using 'pr_err()'. But, the function can fail in legal situations. To avoid making users be surprised and to keep the kernel clean, this commit makes the log to be printed using 'pr_debug()'.
--- mm/damon/vaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/damon/vaddr.c +1 -1
@@ -238,7 +238,7 @@ static void __damon_va_init_regions(struct damon_ctx *ctx,int i;if (damon_va_three_regions (t, regions)) { -pr_err ("Failed to get three regions of target %lu\n" , t->id); +pr_debug ("Failed to get three regions of target %lu\n" , t->id);return ; }
Signature · 1 line
2.17.1
SeongJae Park
maintainerPATCH 3/4 mm/damon/vaddr: Hide kernel pointer from damon_va_three_regions() failure log
In reply to SeongJae ParkThe failure log message for 'damon_va_three_regions()' prints the target id, which is a 'struct pid' pointer in the case. To avoid exposing the kernel pointer via the log, this commit makes the log to use the index of the target in the context's targets list instead.
--- mm/damon/vaddr.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
mm/damon/vaddr.c +8 -2
@@ -232,13 +232,19 @@ static int damon_va_three_regions(struct damon_target *t,static void __damon_va_init_regions (struct damon_ctx *ctx,struct damon_target *t) { +struct damon_target *ti;struct damon_region *r;struct damon_addr_range regions[3 ];unsigned long sz =0 , nr_pieces; -int i; +int i, tidx =0 ;if (damon_va_three_regions (t, regions)) { -pr_debug ("Failed to get three regions of target %lu\n" , t->id); +damon_for_each_target (ti, ctx) { +if (ti == t) +break ; + tidx++; + } +pr_debug ("Failed to get three regions of %dth target\n" , tidx);return ; }
Signature · 1 line
2.17.1
SeongJae Park
maintainerPATCH 4/4 mm/damon: Hide kernel pointer from tracepoint event
In reply to SeongJae ParkDAMON's virtual address spaces monitoring primitive uses 'struct pid *' of the target process as its monitoring target id. The kernel address is exposed as-is to the user space via the DAMON tracepoint, 'damon_aggregated'. Though primarily only privileged users are allowed to access that, it would be better to avoid unnecessarily exposing kernel pointers so. Because the trace result is only required to be able to distinguish each target, we aren't need to use the pointer as-is. This commit makes the tracepoint to use the index of the target in the context's targets list as its id in the tracepoint, to hide the kernel space address.
--- include/trace/events/damon.h | 8 ++++---- mm/damon/core.c | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-)
include/trace/events/damon.h +4 -4
@@ -11,10 +11,10 @@ TRACE_EVENT(damon_aggregated, - TP_PROTO(struct damon_target *t, struct damon_region *r, - unsigned int nr_regions), + TP_PROTO(struct damon_target *t, unsigned int target_id, + struct damon_region *r, unsigned int nr_regions), - TP_ARGS(t, r, nr_regions), + TP_ARGS(t, target_id, r, nr_regions), TP_STRUCT__entry( __field(unsigned long, target_id)
@@ -26,7 +26,7 @@ TRACE_EVENT(damon_aggregated, ), TP_fast_assign( - __entry->target_id = t->id; + __entry->target_id = target_id; __entry->nr_regions = nr_regions; __entry->start = r->ar.start; __entry->end = r->ar.end;
mm/damon/core.c +3 -1
@@ -514,15 +514,17 @@ static bool kdamond_aggregate_interval_passed(struct damon_ctx *ctx)static void kdamond_reset_aggregated (struct damon_ctx *c) {struct damon_target *t; +unsigned int ti =0 ;/* target's index */ damon_for_each_target (t, c) {struct damon_region *r;damon_for_each_region (r, t) { -trace_damon_aggregated (t, r,damon_nr_regions (t)); +trace_damon_aggregated (t, ti, r,damon_nr_regions (t)); r->last_nr_accesses = r->nr_accesses; r->nr_accesses =0 ; } + ti++; } }
Signature · 1 line
2.17.1