Merge "tzlog : Add check to avoid null pointer dereferencing"

javashin · May 26, 2022 · 7f3f920 · 7f3f920
2 parents 6dd9e34 + 19a07ca
commit 7f3f920
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/drivers/firmware/qcom/tz_log.c b/drivers/firmware/qcom/tz_log.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
  */
 #include <linux/debugfs.h>
 #include <linux/errno.h>
@@ -1238,8 +1239,15 @@ static ssize_t tzdbgfs_read(struct file *file, char __user *buf,
 	struct seq_file *seq = file->private_data;
 	int tz_id = TZDBG_STATS_MAX;
 
-	if (seq)
-		tz_id = *(int *)(seq->private);
+	if (seq) {
+		if (seq->private)
+			tz_id = *(int *)(seq->private);
+		else {
+			pr_err("%s: Seq data private null unable to proceed\n",
+				 __func__);
+			return 0;
+		}
+	}
 	else {
 		pr_err("%s: Seq data null unable to proceed\n", __func__);
 		return 0;