diff options
| author | David S. Miller <davem@davemloft.net> | 2012-04-01 21:04:21 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-02 04:33:45 -0400 |
| commit | e545d71390b50a8dab75efb182a4adc3c2603962 (patch) | |
| tree | efc33986581ccdd5b28d06aab81997717d278ea9 /include/net/xfrm.h | |
| parent | 9d83ba4b6c6625de038f03cee18dd7bd89cee69b (diff) | |
| download | linux-stable-e545d71390b50a8dab75efb182a4adc3c2603962.tar.gz linux-stable-e545d71390b50a8dab75efb182a4adc3c2603962.tar.bz2 linux-stable-e545d71390b50a8dab75efb182a4adc3c2603962.zip | |
xfrm: 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 'include/net/xfrm.h')
| -rw-r--r-- | include/net/xfrm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 96239e78e621..1cb32bf107de 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1682,8 +1682,9 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m) static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m) { - if (m->m | m->v) - NLA_PUT(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m); + if ((m->m | m->v) && + nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m)) + goto nla_put_failure; return 0; nla_put_failure: |