Merge tag 'dma-mapping-5.9-2' of git://git.infradead.org/users/hch/dma-mapping

torvalds · torvalds · commit c4011283a7d5 · 2020-08-30T10:37:18.000-07:00
Pull dma-mapping fix from Christoph Hellwig:
 "Fix a possibly uninitialized variable (Dan Carpenter)"

* tag 'dma-mapping-5.9-2' of git://git.infradead.org/users/hch/dma-mapping:
  dma-pool: Fix an uninitialized variable bug in atomic_pool_expand()
diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
@@ -84,7 +84,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,
 			      gfp_t gfp)
 {
 	unsigned int order;
-	struct page *page;
+	struct page *page = NULL;
 	void *addr;
 	int ret = -ENOMEM;
 

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ static int atomic_pool_expand(struct gen_pool *pool, size_t pool_size,`
`84`	`84`	`gfp_t gfp)`
`85`	`85`	`{`
`86`	`86`	`unsigned int order;`
`87`		`- struct page *page;`
	`87`	`+ struct page *page = NULL;`
`88`	`88`	`void *addr;`
`89`	`89`	`int ret = -ENOMEM;`
`90`	`90`