From patchwork Wed Sep 15 23:35:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 512325 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8343EC433F5 for ; Wed, 15 Sep 2021 23:36:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5CC2561242 for ; Wed, 15 Sep 2021 23:36:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbhIOXhY (ORCPT ); Wed, 15 Sep 2021 19:37:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbhIOXhW (ORCPT ); Wed, 15 Sep 2021 19:37:22 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E025C061574 for ; Wed, 15 Sep 2021 16:36:02 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id w7so4326143pgk.13 for ; Wed, 15 Sep 2021 16:36:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Im0DuhBQTNxqq7E8PWjpD2i5rTNvaonLKrPg4mW+Np4=; b=Sh6qKBhz3r/IfZlpRKHlBl2apObaylQvRPAm9L1S7uAd5nuGTrvYFBLXQSIf3z/fQ1 ICEnWJyTdc998H1ZRoyzFIVf0PCIa0I07dYytxtQK/57BJOJ1Vwj6SdoP2xNNp09xClP dqOaGuFSs6dNJtL9QHe/omcjl18/HtLDYIUCFbvKXvbnsVHuK47zUEqsE5KludGGWeQ2 dv+uxeZXWImRr+QUI1Mo5s40py5mqm4l8p07Lj6WJl6faLVIMOruEK4y/xgJ5tLdUbp0 ll0c+Bdmad8+jiDgKpvNbkKhg7zUYyogUcFS/NmROPWN4TnDlnlEp24sIO4mkaCHNbMW 4kFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Im0DuhBQTNxqq7E8PWjpD2i5rTNvaonLKrPg4mW+Np4=; b=2N5ossjDYELE8SG58u18EOa3b8uwXyQF2hdYtJ2I283qwZ8zVFCVbbrgMBPjQyq1DV AILliP11mqoarE/xSsORM4woFZmazqDA0OgGPVe4LfZAdpYB6faRvAKF2LZfTXKUFg/a EiIYJ3uHT5JH7k9Vh1fONpIBWFlyXIn7FSi1EnmEN7dGTdc6aPH7AGAQBIK3a8IDXTzA BNF+2fBvtJVGZSQtPm0k+NC3ShWyfkW3JPF1ME1xwrW1I05rpavo5zAbrzcmWFOOmZMt 1O18ATdPrWTrrl6qN++Mx3pde9uG5YXOV/MR2SdkPJsk1yDNuwacMYOrOVelfKqIaZQa ziYw== X-Gm-Message-State: AOAM530YKTzTkvOTsxeLknDPFnFhCZ3BVx4RXg0bkUtVQMgGpeNsRaV/ 3peb19TLGJsil+e4bLMRn1GyVf2wvyg= X-Google-Smtp-Source: ABdhPJx8NiWJqmKr+jeD984ATAoh3pHuOFeBbrXx+vjUi6wjzeToCLhqoOtCg8tnlhWksjKkPS1+KQ== X-Received: by 2002:a63:7045:: with SMTP id a5mr2134611pgn.404.1631748961902; Wed, 15 Sep 2021 16:36:01 -0700 (PDT) Received: from lvondent-mobl4.intel.com (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id x13sm890980pff.70.2021.09.15.16.36.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 16:36:01 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v4 1/4] Bluetooth: hci_sock: Add support for BT_{SND, RCV}BUF Date: Wed, 15 Sep 2021 16:35:57 -0700 Message-Id: <20210915233600.4129808-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This adds support for BT_{SND,RCV}BUF so userspace can set MTU based on the channel usage. Fixes: https://github.com/bluez/bluez/issues/201 Signed-off-by: Luiz Augusto von Dentz Tested-by: Tedd Ho-Jeong An Tested-by: Tedd Ho-Jeong An Tested-by: Tedd Ho-Jeong An Reported-by: kernel test robot --- net/bluetooth/hci_sock.c | 105 +++++++++++++++++++++++++++++++++++---- 1 file changed, 94 insertions(+), 11 deletions(-) diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 55b0d177375b..e481eee8e61e 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -57,6 +57,7 @@ struct hci_pinfo { unsigned long flags; __u32 cookie; char comm[TASK_COMM_LEN]; + unsigned int mtu; }; static struct hci_dev *hci_hdev_from_sock(struct sock *sk) @@ -1374,6 +1375,10 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, break; } + /* Default MTU to HCI_MAX_FRAME_SIZE if not set */ + if (!hci_pi(sk)->mtu) + hci_pi(sk)->mtu = HCI_MAX_FRAME_SIZE; + sk->sk_state = BT_BOUND; done: @@ -1719,7 +1724,7 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, if (flags & ~(MSG_DONTWAIT | MSG_NOSIGNAL | MSG_ERRQUEUE | MSG_CMSG_COMPAT)) return -EINVAL; - if (len < 4 || len > HCI_MAX_FRAME_SIZE) + if (len < 4 || len > hci_pi(sk)->mtu) return -EINVAL; buf = kmalloc(len, GFP_KERNEL); @@ -1849,8 +1854,8 @@ static int hci_sock_sendmsg(struct socket *sock, struct msghdr *msg, goto done; } -static int hci_sock_setsockopt(struct socket *sock, int level, int optname, - sockptr_t optval, unsigned int len) +static int hci_sock_setsockopt_old(struct socket *sock, int level, int optname, + sockptr_t optval, unsigned int len) { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; @@ -1858,9 +1863,6 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, BT_DBG("sk %p, opt %d", sk, optname); - if (level != SOL_HCI) - return -ENOPROTOOPT; - lock_sock(sk); if (hci_pi(sk)->channel != HCI_CHANNEL_RAW) { @@ -1935,18 +1937,63 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname, return err; } -static int hci_sock_getsockopt(struct socket *sock, int level, int optname, - char __user *optval, int __user *optlen) +static int hci_sock_setsockopt(struct socket *sock, int level, int optname, + sockptr_t optval, unsigned int len) { - struct hci_ufilter uf; struct sock *sk = sock->sk; - int len, opt, err = 0; + int err = 0, opt = 0; BT_DBG("sk %p, opt %d", sk, optname); - if (level != SOL_HCI) + if (level == SOL_HCI) + return hci_sock_setsockopt_old(sock, level, optname, optval, + len); + + if (level != SOL_BLUETOOTH) return -ENOPROTOOPT; + lock_sock(sk); + + switch (optname) { + case BT_SNDMTU: + case BT_RCVMTU: + switch (hci_pi(sk)->channel) { + /* Don't allow changing MTU for channels that are meant for HCI + * traffic only. + */ + case HCI_CHANNEL_RAW: + case HCI_CHANNEL_USER: + err = -ENOPROTOOPT; + goto done; + } + + if (copy_from_sockptr(&opt, optval, sizeof(u16))) { + err = -EFAULT; + break; + } + + hci_pi(sk)->mtu = opt; + break; + + default: + err = -ENOPROTOOPT; + break; + } + +done: + release_sock(sk); + return err; +} + +static int hci_sock_getsockopt_old(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen) +{ + struct hci_ufilter uf; + struct sock *sk = sock->sk; + int len, opt, err = 0; + + BT_DBG("sk %p, opt %d", sk, optname); + if (get_user(len, optlen)) return -EFAULT; @@ -2004,6 +2051,42 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname, return err; } +static int hci_sock_getsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user *optlen) +{ + struct sock *sk = sock->sk; + int len, err = 0; + + BT_DBG("sk %p, opt %d", sk, optname); + + if (level == SOL_HCI) + return hci_sock_getsockopt_old(sock, level, optname, optval, + optlen); + + if (level != SOL_BLUETOOTH) + return -ENOPROTOOPT; + + if (get_user(len, optlen)) + return -EFAULT; + + lock_sock(sk); + + switch (optname) { + case BT_SNDMTU: + case BT_RCVMTU: + if (put_user(hci_pi(sk)->mtu, (u32 __user *)optval)) + err = -EFAULT; + break; + + default: + err = -ENOPROTOOPT; + break; + } + + release_sock(sk); + return err; +} + static const struct proto_ops hci_sock_ops = { .family = PF_BLUETOOTH, .owner = THIS_MODULE, From patchwork Wed Sep 15 23:36:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 512324 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC572C4332F for ; Wed, 15 Sep 2021 23:36:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8EB1C61247 for ; Wed, 15 Sep 2021 23:36:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231795AbhIOXh0 (ORCPT ); Wed, 15 Sep 2021 19:37:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231771AbhIOXhY (ORCPT ); Wed, 15 Sep 2021 19:37:24 -0400 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 701DCC061574 for ; Wed, 15 Sep 2021 16:36:05 -0700 (PDT) Received: by mail-pj1-x102d.google.com with SMTP id il14-20020a17090b164e00b0019c7a7c362dso416464pjb.0 for ; Wed, 15 Sep 2021 16:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=L0h86E9j0CfNSSJWMBPeikGzGgwSYkBSG+0Bm1Cw7vc=; b=Il/3T4HPLaw5S/9RzzXx2rqOWXy0VEqbF77gAuV2Y8Tq/cgahoQTrw8IO9HYI4Je1k 0IZtPQ+Z16tPRY9KMlFBkhlorcmUcqPD1+LCVi/CpVsC15nriwSraiIBMTtMTyyeUdOv nuG197JAwQmc9w0OxAz0p8kSCAWQ8VnLvkZAU0ope2dXOp2tbywQYEgWdbv25jEJqGaq gLXIQI6f/j7t4QKbdGVhTHWkMSGObiTjSztHKlUfyrl3SHwdMqfL01dGbKIo/04fqKgB qUeFN2jc5ingRyDwW9nPNQ5FHyQQiVawYpSmsRPspvFog4G+NAysPwlpXJF0NwnnLVob gmlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=L0h86E9j0CfNSSJWMBPeikGzGgwSYkBSG+0Bm1Cw7vc=; b=UXyt2QEczsRREoVzItCUluKIuRGVPlJrriMOnU+BS759aHCLtgxZy15RANt6/dJK8Y RJG+SugNHYWobyhoqx/OT8HSiv77wa2f41r7SK/Wuvf3n8RSkfgDzg0Od+J/Q1Axn/of NEUKCswANmWs1WSTDwOdcKZz+O3QdMrSD6wHbltNOlEUK16b0BOHmr7xbSj/zMh15Qea /yp2m+Ib8PBEk93o2eYL10lol3HQcnD4AG7xZUNHhG9vY5SNaEXLoUmzmJRSaiC/54tj mD9zLVQAeSq1XTy16EKqHqIwpU/cO0bMRbz7oQ6VXfrCY6fNps8r+RujNSBMNH0XnDCp ZbKw== X-Gm-Message-State: AOAM531hlXhuK7k1c7KD4rIhXuNLfMcv06k7jo/pePIKhMUKPSwBF50r OZ+yT8IXuTFkzSw6gwBEsQKSxxXXI40= X-Google-Smtp-Source: ABdhPJx6ZyPy3sGk1qcmmXYMXW2CSP5mZIgjXaPdGnimEaOtmmgm1SQLRJVrGj+GO1m7+BTPgPDyWg== X-Received: by 2002:a17:902:650b:b0:13a:123a:4ef9 with SMTP id b11-20020a170902650b00b0013a123a4ef9mr1862458plk.49.1631748964694; Wed, 15 Sep 2021 16:36:04 -0700 (PDT) Received: from lvondent-mobl4.intel.com (c-71-56-157-77.hsd1.or.comcast.net. [71.56.157.77]) by smtp.gmail.com with ESMTPSA id x13sm890980pff.70.2021.09.15.16.36.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Sep 2021 16:36:04 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v4 4/4] Bluetooth: SCO: Fix sco_send_frame returning skb->len Date: Wed, 15 Sep 2021 16:36:00 -0700 Message-Id: <20210915233600.4129808-4-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210915233600.4129808-1-luiz.dentz@gmail.com> References: <20210915233600.4129808-1-luiz.dentz@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz The skb in modified by hci_send_sco which pushes SCO headers thus changing skb->len causing sco_sock_sendmsg to fail. Fixes: 0771cbb3b97d ("Bluetooth: SCO: Replace use of memcpy_from_msg with bt_skb_sendmsg") Signed-off-by: Luiz Augusto von Dentz Tested-by: Tedd Ho-Jeong An --- net/bluetooth/sco.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index f51399d1b9cb..8eabf41b2993 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -284,16 +284,17 @@ static int sco_connect(struct hci_dev *hdev, struct sock *sk) static int sco_send_frame(struct sock *sk, struct sk_buff *skb) { struct sco_conn *conn = sco_pi(sk)->conn; + int len = skb->len; /* Check outgoing MTU */ - if (skb->len > conn->mtu) + if (len > conn->mtu) return -EINVAL; - BT_DBG("sk %p len %d", sk, skb->len); + BT_DBG("sk %p len %d", sk, len); hci_send_sco(conn->hcon, skb); - return skb->len; + return len; } static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb) @@ -744,7 +745,8 @@ static int sco_sock_sendmsg(struct socket *sock, struct msghdr *msg, err = -ENOTCONN; release_sock(sk); - if (err) + + if (err < 0) kfree_skb(skb); return err; }