diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 2ec3482e942a9f0b767f79cb45d5e857e225ec2e..9917141729ef4d3b0f2342f8e4cad4846a56a483 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -774,6 +774,12 @@ int dm_table_add_target(struct dm_table *t, const char *type,
 		t->singleton = 1;
 	}
 
+	if (dm_target_always_writeable(tgt->type) && !(t->mode & FMODE_WRITE)) {
+		DMERR("%s: target type %s may not be included in read-only tables",
+		      dm_device_name(t->md), type);
+		return -EINVAL;
+	}
+
 	tgt->table = t;
 	tgt->begin = start;
 	tgt->len = len;
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 294e78a7fccdded7c176988fe89daa807e277423..cc58e2d7c0326e4ed199f8e82e5ac76e42b10a3e 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -166,6 +166,13 @@ struct target_type {
 #define DM_TARGET_SINGLETON		0x00000001
 #define dm_target_needs_singleton(type)	((type)->features & DM_TARGET_SINGLETON)
 
+/*
+ * Indicates that a target does not support read-only devices.
+ */
+#define DM_TARGET_ALWAYS_WRITEABLE	0x00000002
+#define dm_target_always_writeable(type) \
+		((type)->features & DM_TARGET_ALWAYS_WRITEABLE)
+
 struct dm_target {
 	struct dm_table *table;
 	struct target_type *type;