Commit 62e5873e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'size_t-saturating-helpers-5.19-rc1' of... 

Merge tag 'size_t-saturating-helpers-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux

Pull misc hardening updates from Gustavo Silva:
 "Replace a few open-coded instances with size_t saturating arithmetic
  helpers"

* tag 'size_t-saturating-helpers-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux:
  virt: acrn: Prefer array_size and struct_size over open coded arithmetic
  afs: Prefer struct_size over open coded arithmetic
parents a3a8b54b 746f1b0a

drivers/virt/acrn/acrn_drv.h

+6 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ struct vm_memory_region_op { 
 * @reserved:		Reserved.

 * @regions_num:	The number of vm_memory_region_op.

 * @regions_gpa:	Physical address of a vm_memory_region_op array.

 * @regions_op:		Flexible array of vm_memory_region_op.

 *

 * HC_VM_SET_MEMORY_REGIONS uses this structure to manage EPT mappings of

 * multiple memory regions of a User VM. A &struct vm_memory_region_batch
@@ -59,6 +60,7 @@ struct vm_memory_region_batch { 
	u16			   reserved[3];

	u32			   regions_num;

	u64			   regions_gpa;

	struct vm_memory_region_op regions_op[];

};



/**

drivers/virt/acrn/mm.c

+4 −5
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap) 


	/* Get the page number of the map region */

	nr_pages = memmap->len >> PAGE_SHIFT;

	pages = vzalloc(nr_pages * sizeof(struct page *));

	pages = vzalloc(array_size(nr_pages, sizeof(*pages)));

	if (!pages)

		return -ENOMEM;
@@ -244,16 +244,15 @@ int acrn_vm_ram_map(struct acrn_vm *vm, struct acrn_vm_memmap *memmap) 
	}



	/* Prepare the vm_memory_region_batch */

	regions_info = kzalloc(sizeof(*regions_info) +

			       sizeof(*vm_region) * nr_regions,

			       GFP_KERNEL);

	regions_info = kzalloc(struct_size(regions_info, regions_op,

					   nr_regions), GFP_KERNEL);

	if (!regions_info) {

		ret = -ENOMEM;

		goto unmap_kernel_map;

	}



	/* Fill each vm_memory_region_op */

	vm_region = (struct vm_memory_region_op *)(regions_info + 1);

	vm_region = regions_info->regions_op;

	regions_info->vmid = vm->vmid;

	regions_info->regions_num = nr_regions;

	regions_info->regions_gpa = virt_to_phys(vm_region);

fs/afs/security.c

+1 −2
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ void afs_cache_permit(struct afs_vnode *vnode, struct key *key, 
	 * yet.

	 */

	size++;

	new = kzalloc(sizeof(struct afs_permits) +

		      sizeof(struct afs_permit) * size, GFP_NOFS);

	new = kzalloc(struct_size(new, permits, size), GFP_NOFS);

	if (!new)

		goto out_put;