From e48caf2cb01a87efcdd11fe36614f61c3ffe5741 Mon Sep 17 00:00:00 2001 From: Alexander Viro Date: Thu, 3 Jun 2004 07:27:19 -0700 Subject: [PATCH] [PATCH] sparse: netrom annotation --- include/net/netrom.h | 2 +- net/netrom/af_netrom.c | 11 ++++++----- net/netrom/nr_route.c | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/net/netrom.h b/include/net/netrom.h index 01ee604593209..8168780417d7d 100644 --- a/include/net/netrom.h +++ b/include/net/netrom.h @@ -206,7 +206,7 @@ extern void nr_check_iframes_acked(struct sock *, unsigned short); extern void nr_rt_device_down(struct net_device *); extern struct net_device *nr_dev_first(void); extern struct net_device *nr_dev_get(ax25_address *); -extern int nr_rt_ioctl(unsigned int, void *); +extern int nr_rt_ioctl(unsigned int, void __user *); extern void nr_link_failed(ax25_cb *, int); extern int nr_route_frame(struct sk_buff *, ax25_cb *); extern struct file_operations nr_nodes_fops; diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 1e3fe723799ba..b761bebac124c 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -1176,6 +1176,7 @@ static int nr_recvmsg(struct kiocb *iocb, struct socket *sock, static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) { struct sock *sk = sock->sk; + void __user *argp = (void __user *)arg; int ret; lock_sock(sk); @@ -1186,7 +1187,7 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) if (amount < 0) amount = 0; release_sock(sk); - return put_user(amount, (int *)arg); + return put_user(amount, (int __user *)argp); } case TIOCINQ: { @@ -1196,13 +1197,13 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) if ((skb = skb_peek(&sk->sk_receive_queue)) != NULL) amount = skb->len; release_sock(sk); - return put_user(amount, (int *)arg); + return put_user(amount, (int __user *)argp); } case SIOCGSTAMP: ret = -EINVAL; if (sk != NULL) - ret = sock_get_timestamp(sk, (struct timeval __user *)arg); + ret = sock_get_timestamp(sk, argp); release_sock(sk); return ret; @@ -1224,11 +1225,11 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) case SIOCNRDECOBS: release_sock(sk); if (!capable(CAP_NET_ADMIN)) return -EPERM; - return nr_rt_ioctl(cmd, (void *)arg); + return nr_rt_ioctl(cmd, argp); default: release_sock(sk); - return dev_ioctl(cmd, (void __user *)arg); + return dev_ioctl(cmd, argp); } release_sock(sk); diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c index 0505c00d64ff7..dac2e36fcb39b 100644 --- a/net/netrom/nr_route.c +++ b/net/netrom/nr_route.c @@ -647,7 +647,7 @@ static ax25_digi *nr_call_to_digi(int ndigis, ax25_address *digipeaters) /* * Handle the ioctls that control the routing functions. */ -int nr_rt_ioctl(unsigned int cmd, void *arg) +int nr_rt_ioctl(unsigned int cmd, void __user *arg) { struct nr_route_struct nr_route; struct net_device *dev; -- 2.53.0