Merge remote-tracking branch 'sm8250/lineage-20' into lineage-22.1

* sm8250/lineage-20:
  qcacld-5.0: Fix the possible OOB write in country IE unpack
  disp: msm: dsi: add null pointer check in dsi_display_dev_remove

Change-Id: I7da2ff820bd6082a8d19404521f12b3e54e8a2ac

drivers/staging/qcacld-3.0/core/mac/src/sys/legacy/src/utils/src/dot11f.c

@@ -133,7 +133,7 @@ typedef struct sIEDefn {
 #define DOT11F_PARAMETER_CHECK2(pSrc, pBuf, nBuf, pnConsumed) \
 	do { \
 		if (!pSrc || IsBadReadPtr(pSrc, 4))\
-			eturn DOT11F_BAD_INPUT_BUFFER; \
+			return DOT11F_BAD_INPUT_BUFFER; \
 		if (!pBuf || IsBadWritePtr(pBuf, nBuf))\
 			return DOT11F_BAD_OUTPUT_BUFFER; \
 		if (!nBuf)\

techpack/display/msm/dsi/dsi_display.c

@@ -5906,6 +5906,10 @@ int dsi_display_dev_remove(struct platform_device *pdev)
 	}
 
 	display = platform_get_drvdata(pdev);
+	if (!display || !display->panel_node) {
+		DSI_ERR("invalid display\n");
+		return -EINVAL;
+	}
 
 #if defined(OPLUS_FEATURE_PXLW_IRIS5)
 	iris_deinit(display);