Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71709
b: refs/heads/master
c: 55b42c5
h: refs/heads/master
i:
  71707: 1e63259
v: v3
  • Loading branch information
Dmitry Monakhov authored and Alasdair G Kergon committed Oct 20, 2007
1 parent e2fef1b commit e084cdb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 027d50f92ea26fd065aeb141ebfcbbbe010825e3
refs/heads/master: 55b42c5ae9c048de25233434afc7b71b01bee9e6
4 changes: 3 additions & 1 deletion trunk/drivers/md/dm-crypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -861,7 +861,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
cc->iv_mode = kmalloc(strlen(ivmode) + 1, GFP_KERNEL);
if (!cc->iv_mode) {
ti->error = "Error kmallocing iv_mode string";
goto bad5;
goto bad_iv_mode;
}
strcpy(cc->iv_mode, ivmode);
} else
Expand All @@ -870,6 +870,8 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
ti->private = cc;
return 0;

bad_iv_mode:
dm_put_device(ti, cc->dev);
bad5:
bioset_free(cc->bs);
bad_bs:
Expand Down

0 comments on commit e084cdb

Please sign in to comment.