diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-01 18:52:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-01 18:52:31 -0400 |
| commit | f577694143b8024e95b2c0b680ab2071424bb1c7 (patch) | |
| tree | 142901f3cede8dec986bf81fe469a27d9d083b28 /net/netfilter | |
| parent | 242ddfc01499e83cd1e65e1dddb8c96b7f2ba2cc (diff) | |
| download | linux-f577694143b8024e95b2c0b680ab2071424bb1c7.tar.gz linux-f577694143b8024e95b2c0b680ab2071424bb1c7.tar.bz2 linux-f577694143b8024e95b2c0b680ab2071424bb1c7.zip | |
nf_conntrack_proto_generic: 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>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_generic.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_generic.c b/net/netfilter/nf_conntrack_proto_generic.c index 835e24c58f0d..d8923d54b358 100644 --- a/net/netfilter/nf_conntrack_proto_generic.c +++ b/net/netfilter/nf_conntrack_proto_generic.c @@ -90,7 +90,8 @@ generic_timeout_obj_to_nlattr(struct sk_buff *skb, const void *data) { const unsigned int *timeout = data; - NLA_PUT_BE32(skb, CTA_TIMEOUT_GENERIC_TIMEOUT, htonl(*timeout / HZ)); + if (nla_put_be32(skb, CTA_TIMEOUT_GENERIC_TIMEOUT, htonl(*timeout / HZ))) + goto nla_put_failure; return 0; |