svn commit: r262056 - in stable/9/sys: compat/linux security/mac

[Andriy Gapon]

Author: avg
Date: Mon Feb 17 13:53:01 2014
New Revision: 262056
URL: http://svnweb.freebsd.org/changeset/base/262056

Log:
  MFC r255971: Fix some typos that were causing probe argument types to
  show up as unknown
  
  MFC slacker:	markj

Modified:
  stable/9/sys/compat/linux/linux_futex.c
  stable/9/sys/compat/linux/linux_uid16.c
  stable/9/sys/security/mac/mac_framework.c
  stable/9/sys/security/mac/mac_internal.h
  stable/9/sys/security/mac/mac_posix_shm.c
  stable/9/sys/security/mac/mac_vfs.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/compat/linux/linux_futex.c
==============================================================================
--- stable/9/sys/compat/linux/linux_futex.c	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/compat/linux/linux_futex.c	Mon Feb 17 13:53:01 2014	(r262056)
@@ -119,7 +119,7 @@ LIN_SDT_PROBE_DEFINE1(futex, futex_sleep
 LIN_SDT_PROBE_DEFINE3(futex, futex_wake, entry, "struct futex *", "int",
     "uint32_t");
 LIN_SDT_PROBE_DEFINE3(futex, futex_wake, iterate, "uint32_t",
-    "struct waiting_proc *", "uin32_t");
+    "struct waiting_proc *", "uint32_t");
 LIN_SDT_PROBE_DEFINE1(futex, futex_wake, wakeup, "struct waiting_proc *");
 LIN_SDT_PROBE_DEFINE1(futex, futex_wake, return, "int");
 LIN_SDT_PROBE_DEFINE4(futex, futex_requeue, entry, "struct futex *", "int",

Modified: stable/9/sys/compat/linux/linux_uid16.c
==============================================================================
--- stable/9/sys/compat/linux/linux_uid16.c	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/compat/linux/linux_uid16.c	Mon Feb 17 13:53:01 2014	(r262056)
@@ -87,7 +87,7 @@ LIN_SDT_PROBE_DEFINE1(uid16, linux_setgi
 LIN_SDT_PROBE_DEFINE1(uid16, linux_setgid16, return, "int");
 LIN_SDT_PROBE_DEFINE1(uid16, linux_setuid16, entry, "l_uid16_t");
 LIN_SDT_PROBE_DEFINE1(uid16, linux_setuid16, return, "int");
-LIN_SDT_PROBE_DEFINE2(uid16, linux_setregid16, entry, "l_git16_t", "l_git16_t");
+LIN_SDT_PROBE_DEFINE2(uid16, linux_setregid16, entry, "l_gid16_t", "l_gid16_t");
 LIN_SDT_PROBE_DEFINE1(uid16, linux_setregid16, return, "int");
 LIN_SDT_PROBE_DEFINE2(uid16, linux_setreuid16, entry, "l_uid16_t", "l_uid16_t");
 LIN_SDT_PROBE_DEFINE1(uid16, linux_setreuid16, return, "int");

Modified: stable/9/sys/security/mac/mac_framework.c
==============================================================================
--- stable/9/sys/security/mac/mac_framework.c	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/security/mac/mac_framework.c	Mon Feb 17 13:53:01 2014	(r262056)
@@ -95,7 +95,7 @@ SDT_PROVIDER_DEFINE(mac);
 SDT_PROVIDER_DEFINE(mac_framework);
 
 SDT_PROBE_DEFINE2(mac, kernel, policy, modevent, modevent, "int",
-    "struct mac_policy_conf *mpc");
+    "struct mac_policy_conf *");
 SDT_PROBE_DEFINE1(mac, kernel, policy, register, register,
     "struct mac_policy_conf *");
 SDT_PROBE_DEFINE1(mac, kernel, policy, unregister, unregister,

Modified: stable/9/sys/security/mac/mac_internal.h
==============================================================================
--- stable/9/sys/security/mac/mac_internal.h	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/security/mac/mac_internal.h	Mon Feb 17 13:53:01 2014	(r262056)
@@ -119,7 +119,7 @@ SDT_PROVIDER_DECLARE(mac_framework);	/* 
 	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_err,	\
 	    mac-grant-err, "int", arg0, arg1);				\
 	SDT_PROBE_DEFINE3(mac_framework, kernel, name, mac_grant_ok,	\
-	    mac-grant-ok, "INT", arg0, arg1);
+	    mac-grant-ok, "int", arg0, arg1);
 
 #define	MAC_GRANT_PROBE2(name, error, arg0, arg1)	do {		\
 	if (error) {							\

Modified: stable/9/sys/security/mac/mac_posix_shm.c
==============================================================================
--- stable/9/sys/security/mac/mac_posix_shm.c	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/security/mac/mac_posix_shm.c	Mon Feb 17 13:53:01 2014	(r262056)
@@ -133,7 +133,7 @@ mac_posixshm_check_mmap(struct ucred *cr
 }
 
 MAC_CHECK_PROBE_DEFINE3(posixshm_check_open, "struct ucred *",
-    "struct shmfd *", "accmode_t accmode");
+    "struct shmfd *", "accmode_t");
 
 int
 mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd,

Modified: stable/9/sys/security/mac/mac_vfs.c
==============================================================================
--- stable/9/sys/security/mac/mac_vfs.c	Mon Feb 17 13:36:57 2014	(r262055)
+++ stable/9/sys/security/mac/mac_vfs.c	Mon Feb 17 13:53:01 2014	(r262056)
@@ -783,7 +783,7 @@ mac_vnode_check_revoke(struct ucred *cre
 }
 
 MAC_CHECK_PROBE_DEFINE4(vnode_check_setacl, "struct ucred *",
-    "struct vnode *", "acl_tpe_t", "struct acl *");
+    "struct vnode *", "acl_type_t", "struct acl *");
 
 int
 mac_vnode_check_setacl(struct ucred *cred, struct vnode *vp, acl_type_t type,