Merge "msm: adsprpc: null pointer check for fl" (9368b85f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/char/adsprpc.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -739,9 +739,13 @@ static void fastrpc_mmap_free(struct fastrpc_mmap *map, uint32_t flags)
		if (!map)
		return;
		fl = map->fl;
		if (!fl)
		/* remote heap and dynamic loading memory
		* maps expected to initialize with NULL
		*/
		if (!fl && !(map->flags == ADSP_MMAP_HEAP_ADDR \|\|
		map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR))
		return;
		if (!(map->flags == ADSP_MMAP_HEAP_ADDR \|\|
		if (fl && !(map->flags == ADSP_MMAP_HEAP_ADDR \|\|
		map->flags == ADSP_MMAP_REMOTE_HEAP_ADDR)) {
		cid = fl->cid;
		VERIFY(err, cid >= ADSP_DOMAIN_ID && cid < NUM_CHANNELS);