iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

audit: netlink: Move away from NLMSG_NEW().

Browse Source 
And use nlmsg_data() while we're here too.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-06-26 21:45:21 -07:00
parent e05273341c
commit c64e66c67b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
kernel/audit.c
View File

@ -384,7 +384,7 @@ static void audit_hold_skb(struct sk_buff *skb)
static void audit_printk_skb(struct sk_buff *skb) static void audit_printk_skb(struct sk_buff *skb)
{ {
struct nlmsghdr *nlh = nlmsg_hdr(skb); struct nlmsghdr *nlh = nlmsg_hdr(skb);
char *data = NLMSG_DATA(nlh); char *data = nlmsg_data(nlh);
if (nlh->nlmsg_type != AUDIT_EOE) { if (nlh->nlmsg_type != AUDIT_EOE) {
if (printk_ratelimit()) if (printk_ratelimit())
@ -516,14 +516,15 @@ struct sk_buff *audit_make_reply(int pid, int seq, int type, int done,
if (!skb) if (!skb)
return NULL; return NULL;
nlh = NLMSG_NEW(skb, pid, seq, t, size, flags); nlh = nlmsg_put(skb, pid, seq, t, size, flags);
data = NLMSG_DATA(nlh); if (!nlh)
goto out_kfree_skb;
data = nlmsg_data(nlh);
memcpy(data, payload, size); memcpy(data, payload, size);
return skb; return skb;
nlmsg_failure: /* Used by NLMSG_NEW */ out_kfree_skb:
if (skb) kfree_skb(skb);
kfree_skb(skb);
return NULL; return NULL;
} }
@ -680,7 +681,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
sessionid = audit_get_sessionid(current); sessionid = audit_get_sessionid(current);
security_task_getsecid(current, &sid); security_task_getsecid(current, &sid);
seq = nlh->nlmsg_seq; seq = nlh->nlmsg_seq;
data = NLMSG_DATA(nlh); data = nlmsg_data(nlh);
switch (msg_type) { switch (msg_type) {
case AUDIT_GET: case AUDIT_GET:
@ -1060,13 +1061,15 @@ static struct audit_buffer * audit_buffer_alloc(struct audit_context *ctx,
ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask); ab->skb = nlmsg_new(AUDIT_BUFSIZ, gfp_mask);
if (!ab->skb) if (!ab->skb)
goto nlmsg_failure; goto err;
nlh = NLMSG_NEW(ab->skb, 0, 0, type, 0, 0); nlh = nlmsg_put(ab->skb, 0, 0, type, 0, 0);
if (!nlh)
goto out_kfree_skb;
return ab; return ab;
nlmsg_failure: /* Used by NLMSG_NEW */ out_kfree_skb:
kfree_skb(ab->skb); kfree_skb(ab->skb);
ab->skb = NULL; ab->skb = NULL;
err: err: