[PATCH] writeback: verify that underlying dev exists before getting its name

From: Sasha Levin
Date: Fri Sep 04 2015 - 12:56:28 EST


We can't assume there is always an underlying device and must verify that
as well. Otherwise, we'd deref a NULL ptr here.

Signed-off-by: Sasha Levin <sasha.levin@xxxxxxxxxx>
---
include/trace/events/writeback.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index fff846b..8f9efaa 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -66,7 +66,9 @@ TRACE_EVENT(writeback_dirty_page,

TP_fast_assign(
strncpy(__entry->name,
- mapping ? dev_name(inode_to_bdi(mapping->host)->dev) : "(unknown)", 32);
+ mapping && inode_to_bdi(mapping->host)->dev ?
+ dev_name(inode_to_bdi(mapping->host)->dev) :
+ "(unknown)", 32);
__entry->ino = mapping ? mapping->host->i_ino : 0;
__entry->index = page->index;
),
--
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/