* [PATCH] md/dm-table: tgt->type should be putted in dm_table_add_target()
@ 2016-10-21 1:35 tang.junhui
2016-10-21 2:16 ` Mike Snitzer
0 siblings, 1 reply; 2+ messages in thread
From: tang.junhui @ 2016-10-21 1:35 UTC (permalink / raw)
To: agk, snitzer; +Cc: dm-devel, bmarzins, zhang.kai16, tang.junhui, stable
From: "tang.junhui" <tang.junhui@zte.com.cn>
tgt->type should be putted in dm_table_add_target()
when the target do not statisfy the needs of target type,
otherwise it would cause the module reference count
of this target type leakage.
Signed-off-by: tang.junhui <tang.junhui@zte.com.cn>
Cc: stable@vger.kernel.org
---
drivers/md/dm-table.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 6554d91..4f56c38 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -698,30 +698,30 @@ int dm_table_add_target(struct dm_table *t, const char *type,
if (dm_target_needs_singleton(tgt->type)) {
if (t->num_targets) {
- DMERR("%s: target type %s must appear alone in table",
- dm_device_name(t->md), type);
- return -EINVAL;
+ tgt->error = "target type must appear alone in table";
+ r = -EINVAL;
+ goto bad;
}
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->error = "target type may not be included in read-only tables";
+ r = -EINVAL;
+ goto bad;
}
if (t->immutable_target_type) {
if (t->immutable_target_type != tgt->type) {
- DMERR("%s: immutable target type %s cannot be mixed with other target types",
- dm_device_name(t->md), t->immutable_target_type->name);
- return -EINVAL;
+ tgt->error = "immutable target type cannot be mixed with other target types";
+ r = -EINVAL;
+ goto bad;
}
} else if (dm_target_is_immutable(tgt->type)) {
if (t->num_targets) {
- DMERR("%s: immutable target type %s cannot be mixed with other target types",
- dm_device_name(t->md), tgt->type->name);
- return -EINVAL;
+ tgt->error = "immutable target type cannot be mixed with other target types";
+ r = -EINVAL;
+ goto bad;
}
t->immutable_target_type = tgt->type;
}
--
2.8.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: md/dm-table: tgt->type should be putted in dm_table_add_target()
2016-10-21 1:35 [PATCH] md/dm-table: tgt->type should be putted in dm_table_add_target() tang.junhui
@ 2016-10-21 2:16 ` Mike Snitzer
0 siblings, 0 replies; 2+ messages in thread
From: Mike Snitzer @ 2016-10-21 2:16 UTC (permalink / raw)
To: tang.junhui; +Cc: agk, dm-devel, bmarzins, zhang.kai16, stable
On Thu, Oct 20 2016 at 9:35pm -0400,
tang.junhui@zte.com.cn <tang.junhui@zte.com.cn> wrote:
> From: "tang.junhui" <tang.junhui@zte.com.cn>
>
> tgt->type should be putted in dm_table_add_target()
> when the target do not statisfy the needs of target type,
> otherwise it would cause the module reference count
> of this target type leakage.
>
> Signed-off-by: tang.junhui <tang.junhui@zte.com.cn>
> Cc: stable@vger.kernel.org
This issue, missing dm_put_target_type, dates back to 2011.
See these 3 commits:
$ git log --oneline 3791e2fc0^..36a0456fb
36a0456 dm table: add immutable feature
cc6cbe1 dm table: add always writeable feature
3791e2f dm table: add singleton feature
So are you having problems with failed DM table loads (due to the errors
below) resulting in the inability to unload a DM module?
(BTW, you don't need to cc stable when initially proposing a patch for
stable. The stable@ maintainers will automatically pull such stable@
changes in once they land in Linus' tree.)
Mike
> ---
> drivers/md/dm-table.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
> index 6554d91..4f56c38 100644
> --- a/drivers/md/dm-table.c
> +++ b/drivers/md/dm-table.c
> @@ -698,30 +698,30 @@ int dm_table_add_target(struct dm_table *t, const char *type,
>
> if (dm_target_needs_singleton(tgt->type)) {
> if (t->num_targets) {
> - DMERR("%s: target type %s must appear alone in table",
> - dm_device_name(t->md), type);
> - return -EINVAL;
> + tgt->error = "target type must appear alone in table";
> + r = -EINVAL;
> + goto bad;
> }
> 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->error = "target type may not be included in read-only tables";
> + r = -EINVAL;
> + goto bad;
> }
>
> if (t->immutable_target_type) {
> if (t->immutable_target_type != tgt->type) {
> - DMERR("%s: immutable target type %s cannot be mixed with other target types",
> - dm_device_name(t->md), t->immutable_target_type->name);
> - return -EINVAL;
> + tgt->error = "immutable target type cannot be mixed with other target types";
> + r = -EINVAL;
> + goto bad;
> }
> } else if (dm_target_is_immutable(tgt->type)) {
> if (t->num_targets) {
> - DMERR("%s: immutable target type %s cannot be mixed with other target types",
> - dm_device_name(t->md), tgt->type->name);
> - return -EINVAL;
> + tgt->error = "immutable target type cannot be mixed with other target types";
> + r = -EINVAL;
> + goto bad;
> }
> t->immutable_target_type = tgt->type;
> }
> --
> 2.8.1.windows.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-21 2:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-21 1:35 [PATCH] md/dm-table: tgt->type should be putted in dm_table_add_target() tang.junhui
2016-10-21 2:16 ` Mike Snitzer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).