SOFTWARE IS DISCLAIMED.
*/
-/*
- * Bluetooth HCI socket layer.
- *
- * $Id: hci_sock.c,v 1.4 2002/04/18 22:26:14 maxk Exp $
- */
+/* Bluetooth HCI sockets. */
#include <linux/config.h>
#include <linux/module.h>
#ifndef CONFIG_BT_HCI_SOCK_DEBUG
#undef BT_DBG
-#define BT_DBG( A... )
+#define BT_DBG(D...)
#endif
/* ----- HCI socket interface ----- */
if (sock_queue_rcv_skb(sk, nskb))
kfree_skb(nskb);
-
}
read_unlock(&hci_sk_list.lock);
}
return 0;
case HCIGETCONNINFO:
- return hci_get_conn_info(hdev, arg);
+ return hci_get_conn_info(hdev, (void __user *)arg);
default:
if (hdev->ioctl)
static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{
struct sock *sk = sock->sk;
+ void __user *argp = (void __user *)arg;
int err;
BT_DBG("cmd %x arg %lx", cmd, arg);
switch (cmd) {
case HCIGETDEVLIST:
- return hci_get_dev_list(arg);
+ return hci_get_dev_list(argp);
case HCIGETDEVINFO:
- return hci_get_dev_info(arg);
+ return hci_get_dev_info(argp);
case HCIGETCONNLIST:
- return hci_get_conn_list(arg);
+ return hci_get_conn_list(argp);
case HCIDEVUP:
if (!capable(CAP_NET_ADMIN))
case HCISETSCOMTU:
if (!capable(CAP_NET_ADMIN))
return -EACCES;
- return hci_dev_cmd(cmd, arg);
+ return hci_dev_cmd(cmd, argp);
case HCIINQUIRY:
- return hci_inquiry(arg);
+ return hci_inquiry(argp);
default:
lock_sock(sk);
__u32 mask = hci_pi(sk)->cmsg_mask;
if (mask & HCI_CMSG_DIR)
- put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(int), &bt_cb(skb)->incoming);
+ put_cmsg(msg, SOL_HCI, HCI_CMSG_DIR, sizeof(int), &bt_cb(skb)->incoming);
if (mask & HCI_CMSG_TSTAMP)
- put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, sizeof(skb->stamp), &skb->stamp);
+ put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, sizeof(skb->stamp), &skb->stamp);
}
static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
- struct msghdr *msg, size_t len, int flags)
+ struct msghdr *msg, size_t len, int flags)
{
int noblock = flags & MSG_DONTWAIT;
struct sock *sk = sock->sk;
err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
hci_sock_cmsg(sk, msg, skb);
-
+
skb_free_datagram(sk, skb);
return err ? : copied;
if (((ogf > HCI_SFLT_MAX_OGF) ||
!hci_test_bit(ocf & HCI_FLT_OCF_BITS, &hci_sec_filter.ocf_mask[ogf])) &&
- !capable(CAP_NET_RAW)) {
+ !capable(CAP_NET_RAW)) {
err = -EPERM;
goto drop;
}
goto done;
}
-int hci_sock_setsockopt(struct socket *sock, int level, int optname, char *optval, int len)
+int hci_sock_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int len)
{
struct hci_ufilter uf = { .opcode = 0 };
struct sock *sk = sock->sk;
switch (optname) {
case HCI_DATA_DIR:
- if (get_user(opt, (int *)optval)) {
+ if (get_user(opt, (int __user *)optval)) {
err = -EFAULT;
break;
}
break;
case HCI_TIME_STAMP:
- if (get_user(opt, (int *)optval)) {
+ if (get_user(opt, (int __user *)optval)) {
err = -EFAULT;
break;
}
uf.event_mask[1] &= *((u32 *) hci_sec_filter.event_mask + 1);
}
- {
+ {
struct hci_filter *f = &hci_pi(sk)->filter;
-
+
f->type_mask = uf.type_mask;
f->opcode = uf.opcode;
*((u32 *) f->event_mask + 0) = uf.event_mask[0];
err = -ENOPROTOOPT;
break;
}
-
+
release_sock(sk);
return err;
}
-int hci_sock_getsockopt(struct socket *sock, int level, int optname, char *optval, int *optlen)
+int hci_sock_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen)
{
struct hci_ufilter uf;
struct sock *sk = sock->sk;
case HCI_FILTER:
{
struct hci_filter *f = &hci_pi(sk)->filter;
-
+
uf.type_mask = f->type_mask;
uf.opcode = f->opcode;
uf.event_mask[0] = *((u32 *) f->event_mask + 0);
}
struct proto_ops hci_sock_ops = {
- .family = PF_BLUETOOTH,
- .owner = THIS_MODULE,
- .release = hci_sock_release,
- .bind = hci_sock_bind,
- .getname = hci_sock_getname,
- .sendmsg = hci_sock_sendmsg,
- .recvmsg = hci_sock_recvmsg,
- .ioctl = hci_sock_ioctl,
- .poll = datagram_poll,
- .listen = sock_no_listen,
- .shutdown = sock_no_shutdown,
- .setsockopt = hci_sock_setsockopt,
- .getsockopt = hci_sock_getsockopt,
- .connect = sock_no_connect,
- .socketpair = sock_no_socketpair,
- .accept = sock_no_accept,
- .mmap = sock_no_mmap
+ .family = PF_BLUETOOTH,
+ .owner = THIS_MODULE,
+ .release = hci_sock_release,
+ .bind = hci_sock_bind,
+ .getname = hci_sock_getname,
+ .sendmsg = hci_sock_sendmsg,
+ .recvmsg = hci_sock_recvmsg,
+ .ioctl = hci_sock_ioctl,
+ .poll = datagram_poll,
+ .listen = sock_no_listen,
+ .shutdown = sock_no_shutdown,
+ .setsockopt = hci_sock_setsockopt,
+ .getsockopt = hci_sock_getsockopt,
+ .connect = sock_no_connect,
+ .socketpair = sock_no_socketpair,
+ .accept = sock_no_accept,
+ .mmap = sock_no_mmap
};
static int hci_sock_create(struct socket *sock, int protocol)
sk_set_owner(sk, THIS_MODULE);
sock->state = SS_UNCONNECTED;
- sk->sk_state = BT_OPEN;
+ sk->sk_state = BT_OPEN;
bt_sock_link(&hci_sk_list, sk);
return 0;
{
struct hci_dev *hdev = (struct hci_dev *) ptr;
struct hci_ev_si_device ev;
-
+
BT_DBG("hdev %s event %ld", hdev->name, event);
/* Send event to sockets */
ev.event = event;
ev.dev_id = hdev->id;
hci_si_event(NULL, HCI_EV_SI_DEVICE, sizeof(ev), &ev);
-
+
if (event == HCI_DEV_UNREG) {
struct sock *sk;
struct hlist_node *node;
}
struct net_proto_family hci_sock_family_ops = {
- .family = PF_BLUETOOTH,
+ .family = PF_BLUETOOTH,
.owner = THIS_MODULE,
- .create = hci_sock_create,
+ .create = hci_sock_create,
};
struct notifier_block hci_sock_nblock = {
git://git.onelab.eu / linux-2.6.git / blobdiff