Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 Nov 2017 15:30:36 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r325937 - stable/10/sys/ofed/include/linux
Message-ID:  <201711171530.vAHFUa9n077593@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Fri Nov 17 15:30:36 2017
New Revision: 325937
URL: https://svnweb.freebsd.org/changeset/base/325937

Log:
  MFC r325533:
  Make the dma_alloc_coherent() function in the LinuxKPI NULL safe with regard
  to the "dev" argument.
  
  Submitted by:	Krishnamraju Eraparaju @ Chelsio
  Sponsored by:	Chelsio Communications

Modified:
  stable/10/sys/ofed/include/linux/dma-mapping.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/ofed/include/linux/dma-mapping.h
==============================================================================
--- stable/10/sys/ofed/include/linux/dma-mapping.h	Fri Nov 17 15:27:52 2017	(r325936)
+++ stable/10/sys/ofed/include/linux/dma-mapping.h	Fri Nov 17 15:30:36 2017	(r325937)
@@ -126,7 +126,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dm
 	size_t align;
 	void *mem;
 
-	if (dev->dma_mask)
+	if (dev != NULL && dev->dma_mask)
 		high = *dev->dma_mask;
 	else
 		high = BUS_SPACE_MAXADDR_32BIT;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711171530.vAHFUa9n077593>