Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit ef13c8afa67518e1d173a6f3b95dd02559879421

Authored by Linus Torvalds
2 parents 522a15db95 d49ec52ff6
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

Merge tag 'dm-3.17-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm 

Pull device mapper fix from Mike Snitzer:
 "Fix a 3.17-rc1 regression introduced by switching the DM crypt target
  to using per-bio data"

* tag 'dm-3.17-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm crypt: fix access beyond the end of allocated space

Showing 1 changed file Side-by-side Diff

drivers/md/dm-crypt.c
Diff comments   View file @ ef13c8a
... ... @@ -1688,6 +1688,7 @@
1688 1688 unsigned int key_size, opt_params;
1689 1689 unsigned long long tmpll;
1690 1690 int ret;
  1691 + size_t iv_size_padding;
1691 1692 struct dm_arg_set as;
1692 1693 const char *opt_string;
1693 1694 char dummy;
1694 1695  
1695 1696  
1696 1697  
... ... @@ -1724,20 +1725,32 @@
1724 1725  
1725 1726 cc->dmreq_start = sizeof(struct ablkcipher_request);
1726 1727 cc->dmreq_start += crypto_ablkcipher_reqsize(any_tfm(cc));
1727   - cc->dmreq_start = ALIGN(cc->dmreq_start, crypto_tfm_ctx_alignment());
1728   - cc->dmreq_start += crypto_ablkcipher_alignmask(any_tfm(cc)) &
1729   - ~(crypto_tfm_ctx_alignment() - 1);
  1728 + cc->dmreq_start = ALIGN(cc->dmreq_start, __alignof__(struct dm_crypt_request));
1730 1729  
  1730 + if (crypto_ablkcipher_alignmask(any_tfm(cc)) < CRYPTO_MINALIGN) {
  1731 + /* Allocate the padding exactly */
  1732 + iv_size_padding = -(cc->dmreq_start + sizeof(struct dm_crypt_request))
  1733 + & crypto_ablkcipher_alignmask(any_tfm(cc));
  1734 + } else {
  1735 + /*
  1736 + * If the cipher requires greater alignment than kmalloc
  1737 + * alignment, we don't know the exact position of the
  1738 + * initialization vector. We must assume worst case.
  1739 + */
  1740 + iv_size_padding = crypto_ablkcipher_alignmask(any_tfm(cc));
  1741 + }
  1742 +
1731 1743 cc->req_pool = mempool_create_kmalloc_pool(MIN_IOS, cc->dmreq_start +
1732   - sizeof(struct dm_crypt_request) + cc->iv_size);
  1744 + sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size);
1733 1745 if (!cc->req_pool) {
1734 1746 ti->error = "Cannot allocate crypt request mempool";
1735 1747 goto bad;
1736 1748 }
1737 1749  
1738 1750 cc->per_bio_data_size = ti->per_bio_data_size =
1739   - sizeof(struct dm_crypt_io) + cc->dmreq_start +
1740   - sizeof(struct dm_crypt_request) + cc->iv_size;
  1751 + ALIGN(sizeof(struct dm_crypt_io) + cc->dmreq_start +
  1752 + sizeof(struct dm_crypt_request) + iv_size_padding + cc->iv_size,
  1753 + ARCH_KMALLOC_MINALIGN);
1741 1754  
1742 1755 cc->page_pool = mempool_create_page_pool(MIN_POOL_PAGES, 0);
1743 1756 if (!cc->page_pool) {