net: netlink_getname, packet_getname -- use DECLARE_SOCKADDR guard
Subsystems (4)
PATCH 1/1 net: netlink_getname, packet_getname -- use DECLARE_SOCKADDR guard
Use guard DECLARE_SOCKADDR in a few more places which allow us to catch if the structure copied back is too big.
Signed-off-by Cyrill Gorcunov <[email protected]>
---
Please review, comments are welcome!
net/netlink/af_netlink.c | 2 +- net/packet/af_packet.c | 2 +- net/unix/af_unix.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/netlink/af_netlink.c +1 -1
@@ -707,7 +707,7 @@ static int netlink_getname(struct socket {struct sock *sk = sock->sk;struct netlink_sock *nlk =nlk_sk (sk); -struct sockaddr_nl *nladdr = (struct sockaddr_nl *)addr; + DECLARE_SOCKADDR(struct sockaddr_nl *, nladdr, addr); nladdr->nl_family =AF_NETLINK ; nladdr->nl_pad =0 ;
net/packet/af_packet.c +1 -1
@@ -1532,7 +1532,7 @@ static int packet_getname(struct socketstruct net_device *dev;struct sock *sk = sock->sk;struct packet_sock *po =pkt_sk (sk); -struct sockaddr_ll *sll = (struct sockaddr_ll *)uaddr; + DECLARE_SOCKADDR(struct sockaddr_ll *, sll, uaddr);if (peer)return -EOPNOTSUPP ;
net/unix/af_unix.c +1 -1
@@ -1258,7 +1258,7 @@ static int unix_getname(struct socket *s {struct sock *sk = sock->sk;struct unix_sock *u; -struct sockaddr_un *sunaddr = (struct sockaddr_un *)uaddr; + DECLARE_SOCKADDR(struct sockaddr_un *, sunaddr, uaddr);int err =0 ;if (peer) {
From: Cyrill Gorcunov <[email protected]>
Date: Sun, 8 Nov 2009 18:51:19 +0300
Quoted 4 lines
Use guard
DECLARE_SOCKADDRin a few more places which allow us to catch if the structure copied back is too big.Signed-off-by Cyrill Gorcunov <[email protected]>
Applied to net-next-2.6, thanks.