6515554 sdpadm does incorrect check on args passed to itonnv_73

6519010 SIOSYSENABLESDP is misnamed
6564594 "BAD TRAP:  module "genunix" due to a NULL pointer dereference" on amd64 infinband systems in snv_66
6599427 sdp needs to validate work queue entry before processing the mblk
6599436 sdpib leaking memory during detach

4 files changed, 7 insertions, 7 deletions

diff --git a/usr/src/cmd/sdpadm/sdpadm.c b/usr/src/cmd/sdpadm/sdpadm.c
index ccae39be90..f492d97ae4 100755
--- a/usr/src/cmd/sdpadm/sdpadm.c
+++ b/usr/src/cmd/sdpadm/sdpadm.c
@@ -116,18 +116,18 @@ main(int argc, char *argv[])
 
 	if (argc == 2) {
 		/* Parse the on|off from the user */
-		if (strncasecmp(argv[1], "enable", 7) == 0) {
+		if (strcasecmp(argv[1], "enable") == 0) {
 			enable = 1;
-		} else if (strncasecmp(argv[1], "disable", 8) == 0) {
+		} else if (strcasecmp(argv[1], "disable") == 0) {
 			enable = 0;
-		} else if (strncasecmp(argv[1], "status", 7) == 0)
+		} else if (strcasecmp(argv[1], "status") == 0)
 			enable = -1;
 		else {
 			usage();
 		}
 	}
 
-	stri.ic_cmd = SIOSYSENABLESDP;
+	stri.ic_cmd = SIOCSENABLESDP;
 	stri.ic_timout = 0;
 	stri.ic_len = sizeof (int);
 	stri.ic_dp = (char *)&enable;
diff --git a/usr/src/uts/common/fs/sockfs/socksdpvnops.c b/usr/src/uts/common/fs/sockfs/socksdpvnops.c
index 02cb7a07c1..667010ddea 100755
--- a/usr/src/uts/common/fs/sockfs/socksdpvnops.c
+++ b/usr/src/uts/common/fs/sockfs/socksdpvnops.c
@@ -353,7 +353,7 @@ socksdpv_ioctl(struct vnode *vp, int cmd, intptr_t arg, int mode,
 		return (0);
 
 
-	case SIOSYSENABLESDP: {
+	case SIOCSENABLESDP: {
 		int32_t enable;
 
 		/*
diff --git a/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c b/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
index e39550608d..d2b4e7f83a 100755
--- a/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
+++ b/usr/src/uts/common/io/ib/clients/sdp/sdpddi.c
@@ -182,7 +182,7 @@ sdp_gen_ioctl(queue_t *q, mblk_t *mp)
 	/* LINTED */
 	iocp = (struct iocblk *)mp->b_rptr;
 	switch (iocp->ioc_cmd) {
-		case SIOSYSENABLESDP:
+		case SIOCSENABLESDP:
 			bcopy(mp->b_cont->b_rptr, &enable, sizeof (int));
 
 			/*
diff --git a/usr/src/uts/common/sys/sockio.h b/usr/src/uts/common/sys/sockio.h
index 5c542e939e..012e7f3061 100644
--- a/usr/src/uts/common/sys/sockio.h
+++ b/usr/src/uts/common/sys/sockio.h
@@ -316,7 +316,7 @@ extern "C" {
 #define	SIOCSIPMPFAILBACK	_IOW('i', 182, int)	/* enable/disable */
 							/* FAILBACK */
 
-#define	SIOSYSENABLESDP _IOWR('i', 183, int)    /*  Enable SDP */
+#define	SIOCSENABLESDP _IOWR('i', 183, int)    /*  Enable SDP */
 
 #ifdef	__cplusplus
 }