12542 dtrace: NULL pointer errors

Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/usr/src/uts/sparc/dtrace/dtrace_isa.c b/usr/src/uts/sparc/dtrace/dtrace_isa.c
index a90b28efbb..302224260e 100644
--- a/usr/src/uts/sparc/dtrace/dtrace_isa.c
+++ b/usr/src/uts/sparc/dtrace/dtrace_isa.c
@@ -300,7 +300,7 @@ leaf:
 				ASSERT(depth == 0);
 
 				while (depth < pcstack_limit)
-					pcstack[depth++] = NULL;
+					pcstack[depth++] = 0;
 				return;
 			}
 
@@ -343,7 +343,7 @@ leaf:
 			}
 
 			while (depth < pcstack_limit)
-				pcstack[depth++] = NULL;
+				pcstack[depth++] = 0;
 			return;
 		}
 
@@ -505,7 +505,7 @@ dtrace_getupcstack(uint64_t *pcstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 int
@@ -534,7 +534,7 @@ dtrace_getustackdepth(void)
 	 * beyond that NULL return address.
 	 */
 	if (DTRACE_CPUFLAG_ISSET(CPU_DTRACE_ENTRY) &&
-	    (rp->r_o7 != NULL || n != 1))
+	    (rp->r_o7 != 0 || n != 1))
 		n++;
 
 	return (n);
@@ -637,7 +637,7 @@ dtrace_getufpstack(uint64_t *pcstack, uint64_t *fpstack, int pcstack_limit)
 
 zero:
 	while (pcstack_limit-- > 0)
-		*pcstack++ = NULL;
+		*pcstack++ = 0;
 }
 
 uint64_t
diff --git a/usr/src/uts/sparc/dtrace/fbt.c b/usr/src/uts/sparc/dtrace/fbt.c
index 58169bac81..aed1c05b3e 100644
--- a/usr/src/uts/sparc/dtrace/fbt.c
+++ b/usr/src/uts/sparc/dtrace/fbt.c
@@ -379,7 +379,7 @@ fbt_trampoline_unmap()
 	vmem_free(heap_arena, fbt_trampoline_window, fbt_trampoline_size);
 
 	fbt_trampoline_window = NULL;
-	fbt_trampoline = NULL;
+	fbt_trampoline = 0;
 	fbt_trampoline_size = 0;
 }
 
@@ -532,7 +532,7 @@ fbt_patch_entry(uint32_t *instr, uint32_t id, fbt_trampoline_t *tramp,
  * Likewise, rs1 and rs2 in the jmpl of case (b) may be outputs and/or globals.
  * If the jmpl uses outputs or globals, we restructure it to be:
  *
- * 	jmpl		ls2 + (ls3 | offset), (%g0 | %o7)
+ *	jmpl		ls2 + (ls3 | offset), (%g0 | %o7)
  *
  */
 /*ARGSUSED*/
@@ -1040,7 +1040,7 @@ fbt_provide_module(void *arg, struct modctl *ctl)
 	if (strcmp(modname, "kmdbmod") == 0)
 		return;
 
-	if (str == NULL || symhdr == NULL || symhdr->sh_addr == NULL) {
+	if (str == NULL || symhdr == NULL || symhdr->sh_addr == 0) {
 		/*
 		 * If this module doesn't (yet) have its string or symbol
 		 * table allocated, clear out.
@@ -1730,7 +1730,7 @@ fbt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "fbt", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE ||
+	    DDI_PSEUDO, 0) == DDI_FAILURE ||
 	    dtrace_register("fbt", &fbt_attr, DTRACE_PRIV_KERNEL, NULL,
 	    &fbt_pops, NULL, &fbt_id) != 0) {
 		ddi_remove_minor_node(devi, NULL);
diff --git a/usr/src/uts/sparc/dtrace/sdt.c b/usr/src/uts/sparc/dtrace/sdt.c
index 8fbdf24fee..0bfe2ce216 100644
--- a/usr/src/uts/sparc/dtrace/sdt.c
+++ b/usr/src/uts/sparc/dtrace/sdt.c
@@ -367,7 +367,7 @@ sdt_attach(dev_info_t *devi, ddi_attach_cmd_t cmd)
 	}
 
 	if (ddi_create_minor_node(devi, "sdt", S_IFCHR, 0,
-	    DDI_PSEUDO, NULL) == DDI_FAILURE) {
+	    DDI_PSEUDO, 0) == DDI_FAILURE) {
 		ddi_remove_minor_node(devi, NULL);
 		return (DDI_FAILURE);
 	}