C++: Repair following merge.

geoffw0 · geoffw0 · commit acca39bfc7c1 · 2019-12-16T14:12:32.000Z
diff --git a/change-notes/1.24/analysis-cpp.md b/change-notes/1.24/analysis-cpp.md
@@ -20,7 +20,6 @@ The following changes in version 1.24 affect C/C++ analysis in all applications.
 
 ## Changes to libraries
 
-* 
 * Created the `semmle.code.cpp.models.interfaces.Allocation` library to model allocation such as `new` expressions and calls to `malloc`. This in intended to replace the functionality in `semmle.code.cpp.commons.Alloc` with a more consistent and useful interface.
 * Created the `semmle.code.cpp.models.interfaces.Deallocation` library to model deallocation such as `delete` expressions and calls to `free`. This in intended to replace the functionality in `semmle.code.cpp.commons.Alloc` with a more consistent and useful interface.
 * The new class `StackVariable` should be used in place of `LocalScopeVariable`
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Allocation.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Allocation.qll
@@ -80,6 +80,12 @@ class MallocAllocationFunction extends AllocationFunction {
         or
         // alloca(size)
         name = "alloca" and sizeArg = 0
+        or
+        // kmem_alloc(size, flags)
+        name = "kmem_alloc" and sizeArg = 0
+        or
+        // kmem_zalloc(size, flags)
+        name = "kmem_zalloc" and sizeArg = 0
       )
     )
   }
@@ -194,6 +200,12 @@ class StrdupAllocationFunction extends AllocationFunction {
         or
         // MmMapLockedPagesSpecifyCache(list, mode, type, address, flag, flag)
         name = "MmMapLockedPagesSpecifyCache"
+        or
+        // pool_get(pool, flags)
+        name = "pool_get"
+        or
+        // pool_cache_get(pool, flags)
+        name = "pool_cache_get"
       )
     )
   }
diff --git a/cpp/ql/src/semmle/code/cpp/models/implementations/Deallocation.qll b/cpp/ql/src/semmle/code/cpp/models/implementations/Deallocation.qll
@@ -66,6 +66,12 @@ class StandardDeallocationFunction extends DeallocationFunction {
         name = "HeapReAlloc" and freedArg = 2
         or
         name = "CoTaskMemRealloc" and freedArg = 0
+        or
+        name = "kmem_free" and freedArg = 0
+        or
+        name = "pool_put" and freedArg = 1
+        or
+        name = "pool_cache_put" and freedArg = 1
       )
     )
   }

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,12 @@ class MallocAllocationFunction extends AllocationFunction {`
`80`	`80`	`or`
`81`	`81`	`// alloca(size)`
`82`	`82`	`name = "alloca" and sizeArg = 0`
	`83`	`+ or`
	`84`	`+ // kmem_alloc(size, flags)`
	`85`	`+ name = "kmem_alloc" and sizeArg = 0`
	`86`	`+ or`
	`87`	`+ // kmem_zalloc(size, flags)`
	`88`	`+ name = "kmem_zalloc" and sizeArg = 0`
`83`	`89`	`)`
`84`	`90`	`)`
`85`	`91`	`}`
`@@ -194,6 +200,12 @@ class StrdupAllocationFunction extends AllocationFunction {`
`194`	`200`	`or`
`195`	`201`	`// MmMapLockedPagesSpecifyCache(list, mode, type, address, flag, flag)`
`196`	`202`	`name = "MmMapLockedPagesSpecifyCache"`
	`203`	`+ or`
	`204`	`+ // pool_get(pool, flags)`
	`205`	`+ name = "pool_get"`
	`206`	`+ or`
	`207`	`+ // pool_cache_get(pool, flags)`
	`208`	`+ name = "pool_cache_get"`
`197`	`209`	`)`
`198`	`210`	`)`
`199`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,12 @@ class StandardDeallocationFunction extends DeallocationFunction {`
`66`	`66`	`name = "HeapReAlloc" and freedArg = 2`
`67`	`67`	`or`
`68`	`68`	`name = "CoTaskMemRealloc" and freedArg = 0`
	`69`	`+ or`
	`70`	`+ name = "kmem_free" and freedArg = 0`
	`71`	`+ or`
	`72`	`+ name = "pool_put" and freedArg = 1`
	`73`	`+ or`
	`74`	`+ name = "pool_cache_put" and freedArg = 1`
`69`	`75`	`)`
`70`	`76`	`)`
`71`	`77`	`}`