commit
766a78882ddf79b162243649d7dfdbac1fb6fb88 upstream.
Commit
9b1cc9f251 ("dm cache: share cache-metadata object across
inactive and active DM tables") mistakenly ignored the use of ERR_PTR
returns. Restore missing IS_ERR checks and ERR_PTR returns where
appropriate.
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Joe Thornber <ejt@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
if (!cmd) {
DMERR("could not allocate metadata struct");
cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
if (!cmd) {
DMERR("could not allocate metadata struct");
+ return ERR_PTR(-ENOMEM);
}
atomic_set(&cmd->ref_count, 1);
}
atomic_set(&cmd->ref_count, 1);
return cmd;
cmd = metadata_open(bdev, data_block_size, may_format_device, policy_hint_size);
return cmd;
cmd = metadata_open(bdev, data_block_size, may_format_device, policy_hint_size);
mutex_lock(&table_lock);
cmd2 = lookup(bdev);
if (cmd2) {
mutex_lock(&table_lock);
cmd2 = lookup(bdev);
if (cmd2) {
{
struct dm_cache_metadata *cmd = lookup_or_open(bdev, data_block_size,
may_format_device, policy_hint_size);
{
struct dm_cache_metadata *cmd = lookup_or_open(bdev, data_block_size,
may_format_device, policy_hint_size);
- if (cmd && !same_params(cmd, data_block_size)) {
+
+ if (!IS_ERR(cmd) && !same_params(cmd, data_block_size)) {
dm_cache_metadata_close(cmd);
dm_cache_metadata_close(cmd);
+ return ERR_PTR(-EINVAL);