Commit e545d713 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 9d83ba4b

include/net/xfrm.h

+3 −2
Original line number Diff line number Diff line
@@ -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: