From 4c0abe61d0738c17f82602b08459cf667dbec207 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Thu, 8 Jan 2004 09:54:37 -0800 Subject: [PATCH] [NETLINK]: Use size_t for size in {send,recv}msg. --- net/key/af_key.c | 4 ++-- net/netlink/af_netlink.c | 8 ++++---- net/packet/af_packet.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index ed91a5f513352..b0bbc8c9918d5 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -2655,7 +2655,7 @@ static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, } static int pfkey_sendmsg(struct kiocb *kiocb, - struct socket *sock, struct msghdr *msg, int len) + struct socket *sock, struct msghdr *msg, size_t len) { struct sock *sk = sock->sk; struct sk_buff *skb = NULL; @@ -2697,7 +2697,7 @@ out: } static int pfkey_recvmsg(struct kiocb *kiocb, - struct socket *sock, struct msghdr *msg, int len, + struct socket *sock, struct msghdr *msg, size_t len, int flags) { struct sock *sk = sock->sk; diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 8364b00fb9db7..b0e410d1a88c5 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -601,7 +601,7 @@ static inline void netlink_rcv_wake(struct sock *sk) } static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, - struct msghdr *msg, int len) + struct msghdr *msg, size_t len) { struct sock_iocb *siocb = kiocb_to_siocb(kiocb); struct sock *sk = sock->sk; @@ -641,7 +641,7 @@ static int netlink_sendmsg(struct kiocb *kiocb, struct socket *sock, } err = -EMSGSIZE; - if ((unsigned)len > sk->sk_sndbuf - 32) + if (len > sk->sk_sndbuf - 32) goto out; err = -ENOBUFS; skb = alloc_skb(len, GFP_KERNEL); @@ -683,7 +683,7 @@ out: } static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock, - struct msghdr *msg, int len, + struct msghdr *msg, size_t len, int flags) { struct sock_iocb *siocb = kiocb_to_siocb(kiocb); @@ -691,7 +691,7 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock, struct sock *sk = sock->sk; struct netlink_opt *nlk = nlk_sk(sk); int noblock = flags&MSG_DONTWAIT; - int copied; + size_t copied; struct sk_buff *skb; int err; diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index f2ec68d737590..3b1e907174e08 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -284,7 +284,7 @@ oom: */ static int packet_sendmsg_spkt(struct kiocb *iocb, struct socket *sock, - struct msghdr *msg, int len) + struct msghdr *msg, size_t len) { struct sock *sk = sock->sk; struct sockaddr_pkt *saddr=(struct sockaddr_pkt *)msg->msg_name; @@ -659,7 +659,7 @@ ring_is_full: static int packet_sendmsg(struct kiocb *iocb, struct socket *sock, - struct msghdr *msg, int len) + struct msghdr *msg, size_t len) { struct sock *sk = sock->sk; struct sockaddr_ll *saddr=(struct sockaddr_ll *)msg->msg_name; @@ -1007,7 +1007,7 @@ out: */ static int packet_recvmsg(struct kiocb *iocb, struct socket *sock, - struct msghdr *msg, int len, int flags) + struct msghdr *msg, size_t len, int flags) { struct sock *sk = sock->sk; struct sk_buff *skb; -- 2.53.0