[folded-merged] resource-add-walk_system_ram_res_rev-fix.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: resource: Use 2-factor allocator calls
has been removed from the -mm tree.  Its filename was
     resource-add-walk_system_ram_res_rev-fix.patch

This patch was dropped because it was folded into resource-add-walk_system_ram_res_rev.patch

------------------------------------------------------
From: Kees Cook <keescook@xxxxxxxxxxxx>
Subject: resource: Use 2-factor allocator calls

As already done treewide, switch from open-coded multiplication to using
2-factor allocation helpers.

Link: http://lkml.kernel.org/r/20180704173153.GA34386@beast
Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
Cc: AKASHI Takahiro <takahiro.akashi@xxxxxxxxxx>
Cc: Baoquan He <bhe@xxxxxxxxxx>
Cc: Wei Yang <richard.weiyang@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---


diff -puN kernel/resource.c~resource-add-walk_system_ram_res_rev-fix kernel/resource.c
--- a/kernel/resource.c~resource-add-walk_system_ram_res_rev-fix
+++ a/kernel/resource.c
@@ -453,7 +453,7 @@ int walk_system_ram_res_rev(u64 start, u
 	int ret = -1;
 
 	/* create a list */
-	rams = vmalloc(sizeof(struct resource) * rams_size);
+	rams = vmalloc(array_size(rams_size, sizeof(struct resource)));
 	if (!rams)
 		return ret;
 
@@ -469,8 +469,8 @@ int walk_system_ram_res_rev(u64 start, u
 			int rams_new_size;
 
 			rams_new_size = rams_size + 16;
-			rams_new = vmalloc(sizeof(struct resource)
-							* rams_new_size);
+			rams_new = vmalloc(array_size(rams_new_size,
+						      sizeof(struct resource)));
 			if (!rams_new)
 				goto out;
 
_

Patches currently in -mm which might be from keescook@xxxxxxxxxxxx are

ntfs-aops-remove-vla-usage.patch
ntfs-decompress-remove-vla-usage.patch
ntfs-mft-remove-vla-usage.patch
resource-add-walk_system_ram_res_rev.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux