diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-20 12:15:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-20 12:15:48 -0800 |
| commit | e90665a5d38b17fdbe484a85fbba917a7006522d (patch) | |
| tree | 779903b717991c9b9644d0ad8586bfbdca8e9c97 /net | |
| parent | 56ef18829e559e592b0f0cf756aac56996a8259a (diff) | |
| parent | 6df8c9d80a27cb587f61b4f06b57e248d8bc3f86 (diff) | |
| download | linux-stable-e90665a5d38b17fdbe484a85fbba917a7006522d.tar.gz linux-stable-e90665a5d38b17fdbe484a85fbba917a7006522d.tar.bz2 linux-stable-e90665a5d38b17fdbe484a85fbba917a7006522d.zip | |
Merge tag 'ceph-for-4.10-rc5' of git://github.com/ceph/ceph-client
Pull ceph fixes from Ilya Dryomov:
"Three filesystem endianness fixes (one goes back to the 2.6 era, all
marked for stable) and two fixups for this merge window's patches"
* tag 'ceph-for-4.10-rc5' of git://github.com/ceph/ceph-client:
ceph: fix bad endianness handling in parse_reply_info_extra
ceph: fix endianness bug in frag_tree_split_cmp
ceph: fix endianness of getattr mask in ceph_d_revalidate
libceph: make sure ceph_aes_crypt() IV is aligned
ceph: fix ceph_get_caps() interruption
Diffstat (limited to 'net')
| -rw-r--r-- | net/ceph/crypto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ceph/crypto.c b/net/ceph/crypto.c index 3949ce70be07..292e33bd916e 100644 --- a/net/ceph/crypto.c +++ b/net/ceph/crypto.c @@ -214,7 +214,7 @@ static int ceph_aes_crypt(const struct ceph_crypto_key *key, bool encrypt, SKCIPHER_REQUEST_ON_STACK(req, key->tfm); struct sg_table sgt; struct scatterlist prealloc_sg; - char iv[AES_BLOCK_SIZE]; + char iv[AES_BLOCK_SIZE] __aligned(8); int pad_byte = AES_BLOCK_SIZE - (in_len & (AES_BLOCK_SIZE - 1)); int crypt_len = encrypt ? in_len + pad_byte : in_len; int ret; |