mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	The kmalloc() function has a 2-factor argument form, kmalloc_array(). This
patch replaces cases of:
        kmalloc(a * b, gfp)
with:
        kmalloc_array(a * b, gfp)
as well as handling cases of:
        kmalloc(a * b * c, gfp)
with:
        kmalloc(array3_size(a, b, c), gfp)
as it's slightly less ugly than:
        kmalloc_array(array_size(a, b), c, gfp)
This does, however, attempt to ignore constant size factors like:
        kmalloc(4 * 1024, gfp)
though any constants defined via macros get caught up in the conversion.
Any factors with a sizeof() of "unsigned char", "char", and "u8" were
dropped, since they're redundant.
The tools/ directory was manually excluded, since it has its own
implementation of kmalloc().
The Coccinelle script used for this was:
// Fix redundant parens around sizeof().
@@
type TYPE;
expression THING, E;
@@
(
  kmalloc(
-	(sizeof(TYPE)) * E
+	sizeof(TYPE) * E
  , ...)
|
  kmalloc(
-	(sizeof(THING)) * E
+	sizeof(THING) * E
  , ...)
)
// Drop single-byte sizes and redundant parens.
@@
expression COUNT;
typedef u8;
typedef __u8;
@@
(
  kmalloc(
-	sizeof(u8) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(__u8) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(char) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(unsigned char) * (COUNT)
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(u8) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(__u8) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(char) * COUNT
+	COUNT
  , ...)
|
  kmalloc(
-	sizeof(unsigned char) * COUNT
+	COUNT
  , ...)
)
// 2-factor product with sizeof(type/expression) and identifier or constant.
@@
type TYPE;
expression THING;
identifier COUNT_ID;
constant COUNT_CONST;
@@
(
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (COUNT_ID)
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * COUNT_ID
+	COUNT_ID, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (COUNT_CONST)
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * COUNT_CONST
+	COUNT_CONST, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (COUNT_ID)
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * COUNT_ID
+	COUNT_ID, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (COUNT_CONST)
+	COUNT_CONST, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * COUNT_CONST
+	COUNT_CONST, sizeof(THING)
  , ...)
)
// 2-factor product, only identifiers.
@@
identifier SIZE, COUNT;
@@
- kmalloc
+ kmalloc_array
  (
-	SIZE * COUNT
+	COUNT, SIZE
  , ...)
// 3-factor product with 1 sizeof(type) or sizeof(expression), with
// redundant parens removed.
@@
expression THING;
identifier STRIDE, COUNT;
type TYPE;
@@
(
  kmalloc(
-	sizeof(TYPE) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(TYPE) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(TYPE))
  , ...)
|
  kmalloc(
-	sizeof(THING) * (COUNT) * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * (COUNT) * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * COUNT * (STRIDE)
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
|
  kmalloc(
-	sizeof(THING) * COUNT * STRIDE
+	array3_size(COUNT, STRIDE, sizeof(THING))
  , ...)
)
// 3-factor product with 2 sizeof(variable), with redundant parens removed.
@@
expression THING1, THING2;
identifier COUNT;
type TYPE1, TYPE2;
@@
(
  kmalloc(
-	sizeof(TYPE1) * sizeof(TYPE2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(TYPE2))
  , ...)
|
  kmalloc(
-	sizeof(THING1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(THING1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(THING1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * COUNT
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
|
  kmalloc(
-	sizeof(TYPE1) * sizeof(THING2) * (COUNT)
+	array3_size(COUNT, sizeof(TYPE1), sizeof(THING2))
  , ...)
)
// 3-factor product, only identifiers, with redundant parens removed.
@@
identifier STRIDE, SIZE, COUNT;
@@
(
  kmalloc(
-	(COUNT) * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * (STRIDE) * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * STRIDE * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	(COUNT) * (STRIDE) * (SIZE)
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
|
  kmalloc(
-	COUNT * STRIDE * SIZE
+	array3_size(COUNT, STRIDE, SIZE)
  , ...)
)
// Any remaining multi-factor products, first at least 3-factor products,
// when they're not all constants...
@@
expression E1, E2, E3;
constant C1, C2, C3;
@@
(
  kmalloc(C1 * C2 * C3, ...)
|
  kmalloc(
-	(E1) * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	(E1) * (E2) * E3
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	(E1) * (E2) * (E3)
+	array3_size(E1, E2, E3)
  , ...)
|
  kmalloc(
-	E1 * E2 * E3
+	array3_size(E1, E2, E3)
  , ...)
)
// And then all remaining 2 factors products when they're not all constants,
// keeping sizeof() as the second factor argument.
@@
expression THING, E1, E2;
type TYPE;
constant C1, C2, C3;
@@
(
  kmalloc(sizeof(THING) * C2, ...)
|
  kmalloc(sizeof(TYPE) * C2, ...)
|
  kmalloc(C1 * C2 * C3, ...)
|
  kmalloc(C1 * C2, ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * (E2)
+	E2, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(TYPE) * E2
+	E2, sizeof(TYPE)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * (E2)
+	E2, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	sizeof(THING) * E2
+	E2, sizeof(THING)
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	(E1) * E2
+	E1, E2
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	(E1) * (E2)
+	E1, E2
  , ...)
|
- kmalloc
+ kmalloc_array
  (
-	E1 * E2
+	E1, E2
  , ...)
)
Signed-off-by: Kees Cook <keescook@chromium.org>
		
	
			
		
			
				
	
	
		
			174 lines
		
	
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			174 lines
		
	
	
	
		
			3.7 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  linux/arch/arm/mm/pgd.c
 | 
						|
 *
 | 
						|
 *  Copyright (C) 1998-2005 Russell King
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 */
 | 
						|
#include <linux/mm.h>
 | 
						|
#include <linux/gfp.h>
 | 
						|
#include <linux/highmem.h>
 | 
						|
#include <linux/slab.h>
 | 
						|
 | 
						|
#include <asm/cp15.h>
 | 
						|
#include <asm/pgalloc.h>
 | 
						|
#include <asm/page.h>
 | 
						|
#include <asm/tlbflush.h>
 | 
						|
 | 
						|
#include "mm.h"
 | 
						|
 | 
						|
#ifdef CONFIG_ARM_LPAE
 | 
						|
#define __pgd_alloc()	kmalloc_array(PTRS_PER_PGD, sizeof(pgd_t), GFP_KERNEL)
 | 
						|
#define __pgd_free(pgd)	kfree(pgd)
 | 
						|
#else
 | 
						|
#define __pgd_alloc()	(pgd_t *)__get_free_pages(GFP_KERNEL, 2)
 | 
						|
#define __pgd_free(pgd)	free_pages((unsigned long)pgd, 2)
 | 
						|
#endif
 | 
						|
 | 
						|
/*
 | 
						|
 * need to get a 16k page for level 1
 | 
						|
 */
 | 
						|
pgd_t *pgd_alloc(struct mm_struct *mm)
 | 
						|
{
 | 
						|
	pgd_t *new_pgd, *init_pgd;
 | 
						|
	pud_t *new_pud, *init_pud;
 | 
						|
	pmd_t *new_pmd, *init_pmd;
 | 
						|
	pte_t *new_pte, *init_pte;
 | 
						|
 | 
						|
	new_pgd = __pgd_alloc();
 | 
						|
	if (!new_pgd)
 | 
						|
		goto no_pgd;
 | 
						|
 | 
						|
	memset(new_pgd, 0, USER_PTRS_PER_PGD * sizeof(pgd_t));
 | 
						|
 | 
						|
	/*
 | 
						|
	 * Copy over the kernel and IO PGD entries
 | 
						|
	 */
 | 
						|
	init_pgd = pgd_offset_k(0);
 | 
						|
	memcpy(new_pgd + USER_PTRS_PER_PGD, init_pgd + USER_PTRS_PER_PGD,
 | 
						|
		       (PTRS_PER_PGD - USER_PTRS_PER_PGD) * sizeof(pgd_t));
 | 
						|
 | 
						|
	clean_dcache_area(new_pgd, PTRS_PER_PGD * sizeof(pgd_t));
 | 
						|
 | 
						|
#ifdef CONFIG_ARM_LPAE
 | 
						|
	/*
 | 
						|
	 * Allocate PMD table for modules and pkmap mappings.
 | 
						|
	 */
 | 
						|
	new_pud = pud_alloc(mm, new_pgd + pgd_index(MODULES_VADDR),
 | 
						|
			    MODULES_VADDR);
 | 
						|
	if (!new_pud)
 | 
						|
		goto no_pud;
 | 
						|
 | 
						|
	new_pmd = pmd_alloc(mm, new_pud, 0);
 | 
						|
	if (!new_pmd)
 | 
						|
		goto no_pmd;
 | 
						|
#endif
 | 
						|
 | 
						|
	if (!vectors_high()) {
 | 
						|
		/*
 | 
						|
		 * On ARM, first page must always be allocated since it
 | 
						|
		 * contains the machine vectors. The vectors are always high
 | 
						|
		 * with LPAE.
 | 
						|
		 */
 | 
						|
		new_pud = pud_alloc(mm, new_pgd, 0);
 | 
						|
		if (!new_pud)
 | 
						|
			goto no_pud;
 | 
						|
 | 
						|
		new_pmd = pmd_alloc(mm, new_pud, 0);
 | 
						|
		if (!new_pmd)
 | 
						|
			goto no_pmd;
 | 
						|
 | 
						|
		new_pte = pte_alloc_map(mm, new_pmd, 0);
 | 
						|
		if (!new_pte)
 | 
						|
			goto no_pte;
 | 
						|
 | 
						|
#ifndef CONFIG_ARM_LPAE
 | 
						|
		/*
 | 
						|
		 * Modify the PTE pointer to have the correct domain.  This
 | 
						|
		 * needs to be the vectors domain to avoid the low vectors
 | 
						|
		 * being unmapped.
 | 
						|
		 */
 | 
						|
		pmd_val(*new_pmd) &= ~PMD_DOMAIN_MASK;
 | 
						|
		pmd_val(*new_pmd) |= PMD_DOMAIN(DOMAIN_VECTORS);
 | 
						|
#endif
 | 
						|
 | 
						|
		init_pud = pud_offset(init_pgd, 0);
 | 
						|
		init_pmd = pmd_offset(init_pud, 0);
 | 
						|
		init_pte = pte_offset_map(init_pmd, 0);
 | 
						|
		set_pte_ext(new_pte + 0, init_pte[0], 0);
 | 
						|
		set_pte_ext(new_pte + 1, init_pte[1], 0);
 | 
						|
		pte_unmap(init_pte);
 | 
						|
		pte_unmap(new_pte);
 | 
						|
	}
 | 
						|
 | 
						|
	return new_pgd;
 | 
						|
 | 
						|
no_pte:
 | 
						|
	pmd_free(mm, new_pmd);
 | 
						|
	mm_dec_nr_pmds(mm);
 | 
						|
no_pmd:
 | 
						|
	pud_free(mm, new_pud);
 | 
						|
no_pud:
 | 
						|
	__pgd_free(new_pgd);
 | 
						|
no_pgd:
 | 
						|
	return NULL;
 | 
						|
}
 | 
						|
 | 
						|
void pgd_free(struct mm_struct *mm, pgd_t *pgd_base)
 | 
						|
{
 | 
						|
	pgd_t *pgd;
 | 
						|
	pud_t *pud;
 | 
						|
	pmd_t *pmd;
 | 
						|
	pgtable_t pte;
 | 
						|
 | 
						|
	if (!pgd_base)
 | 
						|
		return;
 | 
						|
 | 
						|
	pgd = pgd_base + pgd_index(0);
 | 
						|
	if (pgd_none_or_clear_bad(pgd))
 | 
						|
		goto no_pgd;
 | 
						|
 | 
						|
	pud = pud_offset(pgd, 0);
 | 
						|
	if (pud_none_or_clear_bad(pud))
 | 
						|
		goto no_pud;
 | 
						|
 | 
						|
	pmd = pmd_offset(pud, 0);
 | 
						|
	if (pmd_none_or_clear_bad(pmd))
 | 
						|
		goto no_pmd;
 | 
						|
 | 
						|
	pte = pmd_pgtable(*pmd);
 | 
						|
	pmd_clear(pmd);
 | 
						|
	pte_free(mm, pte);
 | 
						|
	mm_dec_nr_ptes(mm);
 | 
						|
no_pmd:
 | 
						|
	pud_clear(pud);
 | 
						|
	pmd_free(mm, pmd);
 | 
						|
	mm_dec_nr_pmds(mm);
 | 
						|
no_pud:
 | 
						|
	pgd_clear(pgd);
 | 
						|
	pud_free(mm, pud);
 | 
						|
no_pgd:
 | 
						|
#ifdef CONFIG_ARM_LPAE
 | 
						|
	/*
 | 
						|
	 * Free modules/pkmap or identity pmd tables.
 | 
						|
	 */
 | 
						|
	for (pgd = pgd_base; pgd < pgd_base + PTRS_PER_PGD; pgd++) {
 | 
						|
		if (pgd_none_or_clear_bad(pgd))
 | 
						|
			continue;
 | 
						|
		if (pgd_val(*pgd) & L_PGD_SWAPPER)
 | 
						|
			continue;
 | 
						|
		pud = pud_offset(pgd, 0);
 | 
						|
		if (pud_none_or_clear_bad(pud))
 | 
						|
			continue;
 | 
						|
		pmd = pmd_offset(pud, 0);
 | 
						|
		pud_clear(pud);
 | 
						|
		pmd_free(mm, pmd);
 | 
						|
		mm_dec_nr_pmds(mm);
 | 
						|
		pgd_clear(pgd);
 | 
						|
		pud_free(mm, pud);
 | 
						|
	}
 | 
						|
#endif
 | 
						|
	__pgd_free(pgd_base);
 | 
						|
}
 |