Skip to content

L
linux
Commit 60aed2ab authored by David S. Miller's avatar David S. Miller
Browse files
Options

l2tp: 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 7cf7899d
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 50 deletions
net/l2tp/l2tp_netlink.c
View file @ 60aed2ab
...@@ -231,24 +231,28 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags, ...@@ -231,24 +231,28 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags,
if (IS_ERR(hdr)) if (IS_ERR(hdr))
return PTR_ERR(hdr); return PTR_ERR(hdr);
NLA_PUT_U8(skb, L2TP_ATTR_PROTO_VERSION, tunnel->version); if (nla_put_u8(skb, L2TP_ATTR_PROTO_VERSION, tunnel->version) ||
NLA_PUT_U32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id); nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id) ||
NLA_PUT_U32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel->peer_tunnel_id); nla_put_u32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel->peer_tunnel_id) ||
NLA_PUT_U32(skb, L2TP_ATTR_DEBUG, tunnel->debug); nla_put_u32(skb, L2TP_ATTR_DEBUG, tunnel->debug) ||
NLA_PUT_U16(skb, L2TP_ATTR_ENCAP_TYPE, tunnel->encap); nla_put_u16(skb, L2TP_ATTR_ENCAP_TYPE, tunnel->encap))
goto nla_put_failure;
nest = nla_nest_start(skb, L2TP_ATTR_STATS); nest = nla_nest_start(skb, L2TP_ATTR_STATS);
if (nest == NULL) if (nest == NULL)
goto nla_put_failure; goto nla_put_failure;
NLA_PUT_U64(skb, L2TP_ATTR_TX_PACKETS, tunnel->stats.tx_packets); if (nla_put_u64(skb, L2TP_ATTR_TX_PACKETS, tunnel->stats.tx_packets) ||
NLA_PUT_U64(skb, L2TP_ATTR_TX_BYTES, tunnel->stats.tx_bytes); nla_put_u64(skb, L2TP_ATTR_TX_BYTES, tunnel->stats.tx_bytes) ||
NLA_PUT_U64(skb, L2TP_ATTR_TX_ERRORS, tunnel->stats.tx_errors); nla_put_u64(skb, L2TP_ATTR_TX_ERRORS, tunnel->stats.tx_errors) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_PACKETS, tunnel->stats.rx_packets); nla_put_u64(skb, L2TP_ATTR_RX_PACKETS, tunnel->stats.rx_packets) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_BYTES, tunnel->stats.rx_bytes); nla_put_u64(skb, L2TP_ATTR_RX_BYTES, tunnel->stats.rx_bytes) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_SEQ_DISCARDS, tunnel->stats.rx_seq_discards); nla_put_u64(skb, L2TP_ATTR_RX_SEQ_DISCARDS,
NLA_PUT_U64(skb, L2TP_ATTR_RX_OOS_PACKETS, tunnel->stats.rx_oos_packets); tunnel->stats.rx_seq_discards) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_ERRORS, tunnel->stats.rx_errors); nla_put_u64(skb, L2TP_ATTR_RX_OOS_PACKETS,
tunnel->stats.rx_oos_packets) ||
nla_put_u64(skb, L2TP_ATTR_RX_ERRORS, tunnel->stats.rx_errors))
goto nla_put_failure;
nla_nest_end(skb, nest); nla_nest_end(skb, nest);
sk = tunnel->sock; sk = tunnel->sock;
...@@ -259,13 +263,16 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags, ...@@ -259,13 +263,16 @@ static int l2tp_nl_tunnel_send(struct sk_buff *skb, u32 pid, u32 seq, int flags,
switch (tunnel->encap) { switch (tunnel->encap) {
case L2TP_ENCAPTYPE_UDP: case L2TP_ENCAPTYPE_UDP:
NLA_PUT_U16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet->inet_sport)); if (nla_put_u16(skb, L2TP_ATTR_UDP_SPORT, ntohs(inet->inet_sport)) ||
NLA_PUT_U16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet->inet_dport)); nla_put_u16(skb, L2TP_ATTR_UDP_DPORT, ntohs(inet->inet_dport)) ||
NLA_PUT_U8(skb, L2TP_ATTR_UDP_CSUM, (sk->sk_no_check != UDP_CSUM_NOXMIT)); nla_put_u8(skb, L2TP_ATTR_UDP_CSUM,
(sk->sk_no_check != UDP_CSUM_NOXMIT)))
goto nla_put_failure;
/* NOBREAK */ /* NOBREAK */
case L2TP_ENCAPTYPE_IP: case L2TP_ENCAPTYPE_IP:
NLA_PUT_BE32(skb, L2TP_ATTR_IP_SADDR, inet->inet_saddr); if (nla_put_be32(skb, L2TP_ATTR_IP_SADDR, inet->inet_saddr) ||
NLA_PUT_BE32(skb, L2TP_ATTR_IP_DADDR, inet->inet_daddr); nla_put_be32(skb, L2TP_ATTR_IP_DADDR, inet->inet_daddr))
goto nla_put_failure;
break; break;
} }
...@@ -563,43 +570,50 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 pid, u32 seq, int flags ...@@ -563,43 +570,50 @@ static int l2tp_nl_session_send(struct sk_buff *skb, u32 pid, u32 seq, int flags
if (IS_ERR(hdr)) if (IS_ERR(hdr))
return PTR_ERR(hdr); return PTR_ERR(hdr);
NLA_PUT_U32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id); if (nla_put_u32(skb, L2TP_ATTR_CONN_ID, tunnel->tunnel_id) ||
NLA_PUT_U32(skb, L2TP_ATTR_SESSION_ID, session->session_id); nla_put_u32(skb, L2TP_ATTR_SESSION_ID, session->session_id) ||
NLA_PUT_U32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel->peer_tunnel_id); nla_put_u32(skb, L2TP_ATTR_PEER_CONN_ID, tunnel->peer_tunnel_id) ||
NLA_PUT_U32(skb, L2TP_ATTR_PEER_SESSION_ID, session->peer_session_id); nla_put_u32(skb, L2TP_ATTR_PEER_SESSION_ID,
NLA_PUT_U32(skb, L2TP_ATTR_DEBUG, session->debug); session->peer_session_id) ||
NLA_PUT_U16(skb, L2TP_ATTR_PW_TYPE, session->pwtype); nla_put_u32(skb, L2TP_ATTR_DEBUG, session->debug) ||
NLA_PUT_U16(skb, L2TP_ATTR_MTU, session->mtu); nla_put_u16(skb, L2TP_ATTR_PW_TYPE, session->pwtype) ||
if (session->mru) nla_put_u16(skb, L2TP_ATTR_MTU, session->mtu) ||
NLA_PUT_U16(skb, L2TP_ATTR_MRU, session->mru); (session->mru &&
nla_put_u16(skb, L2TP_ATTR_MRU, session->mru)))
if (session->ifname && session->ifname[0]) goto nla_put_failure;
NLA_PUT_STRING(skb, L2TP_ATTR_IFNAME, session->ifname);
if (session->cookie_len) if ((session->ifname && session->ifname[0] &&
NLA_PUT(skb, L2TP_ATTR_COOKIE, session->cookie_len, &session->cookie[0]); nla_put_string(skb, L2TP_ATTR_IFNAME, session->ifname)) ||
if (session->peer_cookie_len) (session->cookie_len &&
NLA_PUT(skb, L2TP_ATTR_PEER_COOKIE, session->peer_cookie_len, &session->peer_cookie[0]); nla_put(skb, L2TP_ATTR_COOKIE, session->cookie_len,
NLA_PUT_U8(skb, L2TP_ATTR_RECV_SEQ, session->recv_seq); &session->cookie[0])) ||
NLA_PUT_U8(skb, L2TP_ATTR_SEND_SEQ, session->send_seq); (session->peer_cookie_len &&
NLA_PUT_U8(skb, L2TP_ATTR_LNS_MODE, session->lns_mode); nla_put(skb, L2TP_ATTR_PEER_COOKIE, session->peer_cookie_len,
&session->peer_cookie[0])) ||
nla_put_u8(skb, L2TP_ATTR_RECV_SEQ, session->recv_seq) ||
nla_put_u8(skb, L2TP_ATTR_SEND_SEQ, session->send_seq) ||
nla_put_u8(skb, L2TP_ATTR_LNS_MODE, session->lns_mode) ||
#ifdef CONFIG_XFRM #ifdef CONFIG_XFRM
if ((sk) && (sk->sk_policy[0] || sk->sk_policy[1])) (((sk) && (sk->sk_policy[0] || sk->sk_policy[1])) &&
NLA_PUT_U8(skb, L2TP_ATTR_USING_IPSEC, 1); nla_put_u8(skb, L2TP_ATTR_USING_IPSEC, 1)) ||
#endif #endif
if (session->reorder_timeout) (session->reorder_timeout &&
NLA_PUT_MSECS(skb, L2TP_ATTR_RECV_TIMEOUT, session->reorder_timeout); nla_put_msecs(skb, L2TP_ATTR_RECV_TIMEOUT, session->reorder_timeout)))
goto nla_put_failure;
nest = nla_nest_start(skb, L2TP_ATTR_STATS); nest = nla_nest_start(skb, L2TP_ATTR_STATS);
if (nest == NULL) if (nest == NULL)
goto nla_put_failure; goto nla_put_failure;
NLA_PUT_U64(skb, L2TP_ATTR_TX_PACKETS, session->stats.tx_packets); if (nla_put_u64(skb, L2TP_ATTR_TX_PACKETS, session->stats.tx_packets) ||
NLA_PUT_U64(skb, L2TP_ATTR_TX_BYTES, session->stats.tx_bytes); nla_put_u64(skb, L2TP_ATTR_TX_BYTES, session->stats.tx_bytes) ||
NLA_PUT_U64(skb, L2TP_ATTR_TX_ERRORS, session->stats.tx_errors); nla_put_u64(skb, L2TP_ATTR_TX_ERRORS, session->stats.tx_errors) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_PACKETS, session->stats.rx_packets); nla_put_u64(skb, L2TP_ATTR_RX_PACKETS, session->stats.rx_packets) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_BYTES, session->stats.rx_bytes); nla_put_u64(skb, L2TP_ATTR_RX_BYTES, session->stats.rx_bytes) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_SEQ_DISCARDS, session->stats.rx_seq_discards); nla_put_u64(skb, L2TP_ATTR_RX_SEQ_DISCARDS,
NLA_PUT_U64(skb, L2TP_ATTR_RX_OOS_PACKETS, session->stats.rx_oos_packets); session->stats.rx_seq_discards) ||
NLA_PUT_U64(skb, L2TP_ATTR_RX_ERRORS, session->stats.rx_errors); nla_put_u64(skb, L2TP_ATTR_RX_OOS_PACKETS,
session->stats.rx_oos_packets) ||
nla_put_u64(skb, L2TP_ATTR_RX_ERRORS, session->stats.rx_errors))
goto nla_put_failure;
nla_nest_end(skb, nest); nla_nest_end(skb, nest);
return genlmsg_end(skb, hdr); return genlmsg_end(skb, hdr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7