mirror of
				git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
				synced 2025-10-31 16:54:21 +00:00 
			
		
		
		
	virtio: kmsan: check/unpoison scatterlist in vring_map_one_sg()
If vring doesn't use the DMA API, KMSAN is unable to tell whether the memory is initialized by hardware. Explicitly call kmsan_handle_dma() from vring_map_one_sg() in this case to prevent false positives. Link: https://lkml.kernel.org/r/20220915150417.722975-23-glider@google.com Signed-off-by: Alexander Potapenko <glider@google.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Andrey Konovalov <andreyknvl@google.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Christoph Hellwig <hch@lst.de> Cc: Christoph Lameter <cl@linux.com> Cc: David Rientjes <rientjes@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Eric Biggers <ebiggers@google.com> Cc: Eric Biggers <ebiggers@kernel.org> Cc: Eric Dumazet <edumazet@google.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: Ilya Leoshkevich <iii@linux.ibm.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Kees Cook <keescook@chromium.org> Cc: Marco Elver <elver@google.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Petr Mladek <pmladek@suse.com> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vasily Gorbik <gor@linux.ibm.com> Cc: Vegard Nossum <vegard.nossum@oracle.com> Cc: Vlastimil Babka <vbabka@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									7ade4f1077
								
							
						
					
					
						commit
						88938359e2
					
				
					 1 changed files with 9 additions and 1 deletions
				
			
		|  | @ -11,6 +11,7 @@ | |||
| #include <linux/module.h> | ||||
| #include <linux/hrtimer.h> | ||||
| #include <linux/dma-mapping.h> | ||||
| #include <linux/kmsan.h> | ||||
| #include <linux/spinlock.h> | ||||
| #include <xen/xen.h> | ||||
| 
 | ||||
|  | @ -352,8 +353,15 @@ static dma_addr_t vring_map_one_sg(const struct vring_virtqueue *vq, | |||
| 				   struct scatterlist *sg, | ||||
| 				   enum dma_data_direction direction) | ||||
| { | ||||
| 	if (!vq->use_dma_api) | ||||
| 	if (!vq->use_dma_api) { | ||||
| 		/*
 | ||||
| 		 * If DMA is not used, KMSAN doesn't know that the scatterlist | ||||
| 		 * is initialized by the hardware. Explicitly check/unpoison it | ||||
| 		 * depending on the direction. | ||||
| 		 */ | ||||
| 		kmsan_handle_dma(sg_page(sg), sg->offset, sg->length, direction); | ||||
| 		return (dma_addr_t)sg_phys(sg); | ||||
| 	} | ||||
| 
 | ||||
| 	/*
 | ||||
| 	 * We can't use dma_map_sg, because we don't use scatterlists in | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Alexander Potapenko
						Alexander Potapenko