Commit c544c028 authored by Eric Paris's avatar Eric Paris Committed by James Morris

SELinux: netlink.c whitespace, syntax, and static declaraction cleanups

This patch changes netlink.c to fix whitespace and syntax issues.  Things that
are fixed may include (does not not have to include)

whitespace at end of lines
spaces followed by tabs
spaces used instead of tabs
spacing around parenthesis
locateion of { around struct and else clauses
location of * in pointer declarations
removal of initialization of static data to keep it in the right section
useless {} in if statemetns
useless checking for NULL before kfree
fixing of the indentation depth of switch statements
and any number of other things I forgot to mention
Signed-off-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent a6aaafee
...@@ -24,16 +24,16 @@ static struct sock *selnl; ...@@ -24,16 +24,16 @@ static struct sock *selnl;
static int selnl_msglen(int msgtype) static int selnl_msglen(int msgtype)
{ {
int ret = 0; int ret = 0;
switch (msgtype) { switch (msgtype) {
case SELNL_MSG_SETENFORCE: case SELNL_MSG_SETENFORCE:
ret = sizeof(struct selnl_msg_setenforce); ret = sizeof(struct selnl_msg_setenforce);
break; break;
case SELNL_MSG_POLICYLOAD: case SELNL_MSG_POLICYLOAD:
ret = sizeof(struct selnl_msg_policyload); ret = sizeof(struct selnl_msg_policyload);
break; break;
default: default:
BUG(); BUG();
} }
...@@ -45,15 +45,15 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void * ...@@ -45,15 +45,15 @@ static void selnl_add_payload(struct nlmsghdr *nlh, int len, int msgtype, void *
switch (msgtype) { switch (msgtype) {
case SELNL_MSG_SETENFORCE: { case SELNL_MSG_SETENFORCE: {
struct selnl_msg_setenforce *msg = NLMSG_DATA(nlh); struct selnl_msg_setenforce *msg = NLMSG_DATA(nlh);
memset(msg, 0, len); memset(msg, 0, len);
msg->val = *((int *)data); msg->val = *((int *)data);
break; break;
} }
case SELNL_MSG_POLICYLOAD: { case SELNL_MSG_POLICYLOAD: {
struct selnl_msg_policyload *msg = NLMSG_DATA(nlh); struct selnl_msg_policyload *msg = NLMSG_DATA(nlh);
memset(msg, 0, len); memset(msg, 0, len);
msg->seqno = *((u32 *)data); msg->seqno = *((u32 *)data);
break; break;
...@@ -70,9 +70,9 @@ static void selnl_notify(int msgtype, void *data) ...@@ -70,9 +70,9 @@ static void selnl_notify(int msgtype, void *data)
sk_buff_data_t tmp; sk_buff_data_t tmp;
struct sk_buff *skb; struct sk_buff *skb;
struct nlmsghdr *nlh; struct nlmsghdr *nlh;
len = selnl_msglen(msgtype); len = selnl_msglen(msgtype);
skb = alloc_skb(NLMSG_SPACE(len), GFP_USER); skb = alloc_skb(NLMSG_SPACE(len), GFP_USER);
if (!skb) if (!skb)
goto oom; goto oom;
...@@ -85,7 +85,7 @@ static void selnl_notify(int msgtype, void *data) ...@@ -85,7 +85,7 @@ static void selnl_notify(int msgtype, void *data)
netlink_broadcast(selnl, skb, 0, SELNLGRP_AVC, GFP_USER); netlink_broadcast(selnl, skb, 0, SELNLGRP_AVC, GFP_USER);
out: out:
return; return;
nlmsg_failure: nlmsg_failure:
kfree_skb(skb); kfree_skb(skb);
oom: oom:
...@@ -109,7 +109,7 @@ static int __init selnl_init(void) ...@@ -109,7 +109,7 @@ static int __init selnl_init(void)
SELNLGRP_MAX, NULL, NULL, THIS_MODULE); SELNLGRP_MAX, NULL, NULL, THIS_MODULE);
if (selnl == NULL) if (selnl == NULL)
panic("SELinux: Cannot create netlink socket."); panic("SELinux: Cannot create netlink socket.");
netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV); netlink_set_nonroot(NETLINK_SELINUX, NL_NONROOT_RECV);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment