hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfnetlink_acct: Stop using NLA_PUT*(). 

These macros contain a hidden goto, and are thus extremely error
prone and make code hard to audit.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-04-01 18:46:29 -04:00
parent 48f03bdad8
commit 7c80118953
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/netfilter/nfnetlink_acct.c
View File

@ -109,7 +109,8 @@ nfnl_acct_fill_info(struct sk_buff *skb, u32 pid, u32 seq, u32 type,
nfmsg->version = NFNETLINK_V0; nfmsg->version = NFNETLINK_V0;
nfmsg->res_id = 0; nfmsg->res_id = 0;
NLA_PUT_STRING(skb, NFACCT_NAME, acct->name); if (nla_put_string(skb, NFACCT_NAME, acct->name))
goto nla_put_failure;
if (type == NFNL_MSG_ACCT_GET_CTRZERO) { if (type == NFNL_MSG_ACCT_GET_CTRZERO) {
pkts = atomic64_xchg(&acct->pkts, 0); pkts = atomic64_xchg(&acct->pkts, 0);
@ -118,9 +119,10 @@ nfnl_acct_fill_info(struct sk_buff *skb, u32 pid, u32 seq, u32 type,
pkts = atomic64_read(&acct->pkts); pkts = atomic64_read(&acct->pkts);
bytes = atomic64_read(&acct->bytes); bytes = atomic64_read(&acct->bytes);
} }
NLA_PUT_BE64(skb, NFACCT_PKTS, cpu_to_be64(pkts)); if (nla_put_be64(skb, NFACCT_PKTS, cpu_to_be64(pkts)) ||
NLA_PUT_BE64(skb, NFACCT_BYTES, cpu_to_be64(bytes)); nla_put_be64(skb, NFACCT_BYTES, cpu_to_be64(bytes)) ||
NLA_PUT_BE32(skb, NFACCT_USE, htonl(atomic_read(&acct->refcnt))); nla_put_be32(skb, NFACCT_USE, htonl(atomic_read(&acct->refcnt))))
goto nla_put_failure;
nlmsg_end(skb, nlh); nlmsg_end(skb, nlh);
return skb->len; return skb->len;