tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'kmalloc_obj-prep-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull kmalloc_obj prep from Kees Cook:
"Fixes for return types to prepare for the kmalloc_obj treewide
conversion, that haven't yet appeared during the merge window:
dm-crypt, dm-zoned, drm/msm, and arm64 kvm"

* tag 'kmalloc_obj-prep-v7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
KVM: arm64: vgic: Handle const qualifier from gic_kvm_info allocation type
drm/msm: Adjust msm_iommu_pagetable_prealloc_allocate() allocation type
dm: dm-zoned: Adjust dmz_load_mapping() allocation type
dm-crypt: Adjust crypt_alloc_tfms_aead() allocation type

Linus Torvalds 43257b2e a95f71ad

+4 -4
+1 -1
arch/arm64/kvm/vgic/vgic-init.c
··· 654 654 void __init vgic_set_kvm_info(const struct gic_kvm_info *info) 655 655 { 656 656 BUG_ON(gic_kvm_info != NULL); 657 - gic_kvm_info = kmalloc(sizeof(*info), GFP_KERNEL); 657 + gic_kvm_info = kmalloc(sizeof(*gic_kvm_info), GFP_KERNEL); 658 658 if (gic_kvm_info) 659 659 *gic_kvm_info = *info; 660 660 }
+1 -1
drivers/gpu/drm/msm/msm_iommu.c
··· 332 332 struct kmem_cache *pt_cache = get_pt_cache(mmu); 333 333 int ret; 334 334 335 - p->pages = kvmalloc_array(p->count, sizeof(p->pages), GFP_KERNEL); 335 + p->pages = kvmalloc_array(p->count, sizeof(*p->pages), GFP_KERNEL); 336 336 if (!p->pages) 337 337 return -ENOMEM; 338 338
+1 -1
drivers/md/dm-crypt.c
··· 2364 2364 { 2365 2365 int err; 2366 2366 2367 - cc->cipher_tfm.tfms = kmalloc(sizeof(struct crypto_aead *), GFP_KERNEL); 2367 + cc->cipher_tfm.tfms = kmalloc(sizeof(struct crypto_skcipher *), GFP_KERNEL); 2368 2368 if (!cc->cipher_tfm.tfms) 2369 2369 return -ENOMEM; 2370 2370
+1 -1
drivers/md/dm-zoned-metadata.c
··· 1687 1687 1688 1688 /* Metadata block array for the chunk mapping table */ 1689 1689 zmd->map_mblk = kcalloc(zmd->nr_map_blocks, 1690 - sizeof(struct dmz_mblk *), GFP_KERNEL); 1690 + sizeof(struct dmz_mblock *), GFP_KERNEL); 1691 1691 if (!zmd->map_mblk) 1692 1692 return -ENOMEM; 1693 1693