GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-03-31 19:45:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dm cache: fix missing ERR_PTR returns and handling

Browse source 
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>
Cc: stable@vger.kernel.org
This commit is contained in:
Joe Thornber 2015-01-28 12:07:46 +00:00 • committed by Mike Snitzer
parent 26bc420b59
commit 766a78882d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/md/dm-cache-metadata.c
View file

@ -683,7 +683,7 @@ static struct dm_cache_metadata *metadata_open(struct block_device *bdev,
cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); cmd = kzalloc(sizeof(*cmd), GFP_KERNEL);
if (!cmd) { if (!cmd) {
DMERR("could not allocate metadata struct"); DMERR("could not allocate metadata struct");
return NULL; return ERR_PTR(-ENOMEM);
} }
atomic_set(&cmd->ref_count, 1); atomic_set(&cmd->ref_count, 1);
@ -745,7 +745,7 @@ static struct dm_cache_metadata *lookup_or_open(struct block_device *bdev,
return cmd; return cmd;
cmd = metadata_open(bdev, data_block_size, may_format_device, policy_hint_size); cmd = metadata_open(bdev, data_block_size, may_format_device, policy_hint_size);
if (cmd) { if (!IS_ERR(cmd)) {
mutex_lock(&table_lock); mutex_lock(&table_lock);
cmd2 = lookup(bdev); cmd2 = lookup(bdev);
if (cmd2) { if (cmd2) {
@ -780,9 +780,10 @@ struct dm_cache_metadata *dm_cache_metadata_open(struct block_device *bdev,
{ {
struct dm_cache_metadata *cmd = lookup_or_open(bdev, data_block_size, struct dm_cache_metadata *cmd = lookup_or_open(bdev, data_block_size,
may_format_device, policy_hint_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 NULL; return ERR_PTR(-EINVAL);
} }
return cmd; return cmd;