Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b08fc527 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull more overflow updates from Kees Cook:
 "The rest of the overflow changes for v4.18-rc1.

  This includes the explicit overflow fixes from Silvio, further
  struct_size() conversions from Matthew, and a bug fix from Dan.

  But the bulk of it is the treewide conversions to use either the
  2-factor argument allocators (e.g. kmalloc(a * b, ...) into
  kmalloc_array(a, b, ...) or the array_size() macros (e.g. vmalloc(a *
  b) into vmalloc(array_size(a, b)).

  Coccinelle was fighting me on several fronts, so I've done a bunch of
  manual whitespace updates in the patches as well.

  Summary:

   - Error path bug fix for overflow tests (Dan)

   - Additional struct_size() conversions (Matthew, Kees)

   - Explicitly reported overflow fixes (Silvio, Kees)

   - Add missing kvcalloc() function (Kees)

   - Treewide conversions of allocators to use either 2-factor argument
     variant when available, or array_size() and array3_size() as needed
     (Kees)"

* tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: (26 commits)
  treewide: Use array_size in f2fs_kvzalloc()
  treewide: Use array_size() in f2fs_kzalloc()
  treewide: Use array_size() in f2fs_kmalloc()
  treewide: Use array_size() in sock_kmalloc()
  treewide: Use array_size() in kvzalloc_node()
  treewide: Use array_size() in vzalloc_node()
  treewide: Use array_size() in vzalloc()
  treewide: Use array_size() in vmalloc()
  treewide: devm_kzalloc() -> devm_kcalloc()
  treewide: devm_kmalloc() -> devm_kmalloc_array()
  treewide: kvzalloc() -> kvcalloc()
  treewide: kvmalloc() -> kvmalloc_array()
  treewide: kzalloc_node() -> kcalloc_node()
  treewide: kzalloc() -> kcalloc()
  treewide: kmalloc() -> kmalloc_array()
  mm: Introduce kvcalloc()
  video: uvesafb: Fix integer overflow in allocation
  UBIFS: Fix potential integer overflow in allocation
  leds: Use struct_size() in allocation
  Convert intel uncore to struct_size
  ...
parents 4597fcff 9d2a789c

arch/arm/kernel/sys_oabi-compat.c

+2 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ asmlinkage long sys_oabi_epoll_wait(int epfd, 
		return -EINVAL;

	if (!access_ok(VERIFY_WRITE, events, sizeof(*events) * maxevents))

		return -EFAULT;

	kbuf = kmalloc(sizeof(*kbuf) * maxevents, GFP_KERNEL);

	kbuf = kmalloc_array(maxevents, sizeof(*kbuf), GFP_KERNEL);

	if (!kbuf)

		return -ENOMEM;

	fs = get_fs();
@@ -324,7 +324,7 @@ asmlinkage long sys_oabi_semtimedop(int semid, 
		return -EINVAL;

	if (!access_ok(VERIFY_READ, tsops, sizeof(*tsops) * nsops))

		return -EFAULT;

	sops = kmalloc(sizeof(*sops) * nsops, GFP_KERNEL);

	sops = kmalloc_array(nsops, sizeof(*sops), GFP_KERNEL);

	if (!sops)

		return -ENOMEM;

	err = 0;

arch/arm/mach-footbridge/dc21285.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ int __init dc21285_setup(int nr, struct pci_sys_data *sys) 
	if (nr || !footbridge_cfn_mode())

		return 0;



	res = kzalloc(sizeof(struct resource) * 2, GFP_KERNEL);

	res = kcalloc(2, sizeof(struct resource), GFP_KERNEL);

	if (!res) {

		printk("out of memory for root bus resources");

		return 0;

arch/arm/mach-ixp4xx/common-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ int ixp4xx_setup(int nr, struct pci_sys_data *sys) 
	if (nr >= 1)

		return 0;



	res = kzalloc(sizeof(*res) * 2, GFP_KERNEL);

	res = kcalloc(2, sizeof(*res), GFP_KERNEL);

	if (res == NULL) {

		/* 

		 * If we're out of memory this early, something is wrong,

arch/arm/mach-omap1/mcbsp.c

+1 −1
Original line number Diff line number Diff line
@@ -389,7 +389,7 @@ static void omap_mcbsp_register_board_cfg(struct resource *res, int res_count, 
{

	int i;



	omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),

	omap_mcbsp_devices = kcalloc(size, sizeof(struct platform_device *),

				     GFP_KERNEL);

	if (!omap_mcbsp_devices) {

		printk(KERN_ERR "Could not register McBSP devices\n");

arch/arm/mach-omap2/hsmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
{

	char *hc_name;



	hc_name = kzalloc(sizeof(char) * (HSMMC_NAME_LEN + 1), GFP_KERNEL);

	hc_name = kzalloc(HSMMC_NAME_LEN + 1, GFP_KERNEL);

	if (!hc_name) {

		kfree(hc_name);

		return -ENOMEM;