Skip to content

Commit

Permalink
net,socket: introduce DECLARE_SOCKADDR helper to catch overflow at bu…
Browse files Browse the repository at this point in the history
…ild time

proto_ops->getname implies copying protocol specific data
into storage unit (particulary to __kernel_sockaddr_storage).
So when we implement new protocol support we should keep such
a detail in mind (which is easy to forget about).

Lets introduce DECLARE_SOCKADDR helper which check if
storage unit is not overfowed at build time.

Eventually inet_getname is switched to use DECLARE_SOCKADDR
(to show example of usage).

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Cyrill Gorcunov authored and David S. Miller committed Oct 29, 2009
1 parent ed3f2e4 commit 38bfd8f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions include/linux/net.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,9 @@ struct proto_ops {
struct pipe_inode_info *pipe, size_t len, unsigned int flags);
};

#define DECLARE_SOCKADDR(type, dst, src) \
type dst = ({ __sockaddr_check_size(sizeof(*dst)); (type) src; })

struct net_proto_family {
int family;
int (*create)(struct net *net, struct socket *sock, int protocol);
Expand Down
3 changes: 3 additions & 0 deletions include/linux/socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ struct __kernel_sockaddr_storage {
#include <linux/types.h> /* pid_t */
#include <linux/compiler.h> /* __user */

#define __sockaddr_check_size(size) \
BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))

#ifdef __KERNEL__
# ifdef CONFIG_PROC_FS
struct seq_file;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv4/af_inet.c
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,7 @@ int inet_getname(struct socket *sock, struct sockaddr *uaddr,
{
struct sock *sk = sock->sk;
struct inet_sock *inet = inet_sk(sk);
struct sockaddr_in *sin = (struct sockaddr_in *)uaddr;
DECLARE_SOCKADDR(struct sockaddr_in *, sin, uaddr);

sin->sin_family = AF_INET;
if (peer) {
Expand Down

0 comments on commit 38bfd8f

Please sign in to comment.