diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-10-03 10:49:27 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-10-03 10:49:27 -0400 |
| commit | 687c3c36e754a999a8263745b27965128db4fee5 (patch) | |
| tree | b2da54484833da41c4d112429becc0ae5df1941e /fs/ext4/crypto_fname.c | |
| parent | 3684de8ca2b82180f2cdcf5fbcfd3d29ef0afaf8 (diff) | |
| download | blackbird-op-linux-687c3c36e754a999a8263745b27965128db4fee5.tar.gz blackbird-op-linux-687c3c36e754a999a8263745b27965128db4fee5.zip | |
ext4 crypto: replace some BUG_ON()'s with error checks
Buggy (or hostile) userspace should not be able to cause the kernel to
crash.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/ext4/crypto_fname.c')
| -rw-r--r-- | fs/ext4/crypto_fname.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/ext4/crypto_fname.c b/fs/ext4/crypto_fname.c index 847f919c84d9..2fbef8a14760 100644 --- a/fs/ext4/crypto_fname.c +++ b/fs/ext4/crypto_fname.c @@ -120,7 +120,6 @@ static int ext4_fname_encrypt(struct inode *inode, ablkcipher_request_set_crypt(req, &src_sg, &dst_sg, ciphertext_len, iv); res = crypto_ablkcipher_encrypt(req); if (res == -EINPROGRESS || res == -EBUSY) { - BUG_ON(req->base.data != &ecr); wait_for_completion(&ecr.completion); res = ecr.res; } @@ -182,7 +181,6 @@ static int ext4_fname_decrypt(struct inode *inode, ablkcipher_request_set_crypt(req, &src_sg, &dst_sg, iname->len, iv); res = crypto_ablkcipher_decrypt(req); if (res == -EINPROGRESS || res == -EBUSY) { - BUG_ON(req->base.data != &ecr); wait_for_completion(&ecr.completion); res = ecr.res; } |
