2 files changed, 15 insertions, 0 deletions

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 832b5f44be5c..bfc9a35bad33 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -499,6 +499,15 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, char
                 break;
 
         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);
+                        uf.event_mask[1] = *((u32 *) f->event_mask + 1);
+                }
+
                 len = min_t(unsigned int, len, sizeof(uf));
                 if (copy_from_user(&uf, optval, len)) {
                         err = -EFAULT;
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index a5867879b615..a59b1fb63b76 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -954,11 +954,17 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
 
         switch (optname) {
         case L2CAP_OPTIONS:
+                opts.imtu     = l2cap_pi(sk)->imtu;
+                opts.omtu     = l2cap_pi(sk)->omtu;
+                opts.flush_to = l2cap_pi(sk)->flush_to;
+                opts.mode     = 0x00;
+
                 len = min_t(unsigned int, sizeof(opts), optlen);
                 if (copy_from_user((char *) &opts, optval, len)) {
                         err = -EFAULT;
                         break;
                 }
+
                 l2cap_pi(sk)->imtu  = opts.imtu;
                 l2cap_pi(sk)->omtu  = opts.omtu;
                 break;