Merge android14-gs-pixel-5.15-udc-d1 into android14-gs-pixel-5.15-udc-qpr1

SBMerger: 526756187
Change-Id: Id78d07e3203fde67e4b0719772de6e8458b8314d
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

2 files changed, 8 insertions, 5 deletions

diff --git a/hsspi_coredump.c b/hsspi_coredump.c
index 1dbe33c..f163ec7 100644
--- a/hsspi_coredump.c
+++ b/hsspi_coredump.c
@@ -159,11 +159,14 @@ static void coredump_header_ntf_received(struct coredump_layer *layer,
 	layer->coredump_status = COREDUMP_RCV_NACK;
 
 	data = krealloc(layer->coredump_data, layer->coredump_size, GFP_KERNEL);
-
-	if (data)
+	if (ZERO_OR_NULL_PTR(data)) {
+		layer->coredump_data = NULL;
+		layer->coredump_size = 0;
+		layer->coredump_crc = 0;
+		pr_err("qm35: failed to allocate coredump mem: %px\n", data);
+	} else {
 		layer->coredump_data = data;
-	else
-		pr_err("qm35: failed to allocate coredump mem\n");
+	}
 }
 
 static int coredump_body_ntf_received(struct coredump_layer *layer,
diff --git a/qm35.h b/qm35.h
index 3d19450..ea087fe 100644
--- a/qm35.h
+++ b/qm35.h
@@ -24,7 +24,7 @@
 #define QM_BOOT_MS 450
 #define QM_BEFORE_RESET_MS 450
 
-#define DRV_VERSION "6.3.0-rc1"
+#define DRV_VERSION "6.3.1-rc2"
 
 struct regulator;