From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756275AbcHXUy3 (ORCPT ); Wed, 24 Aug 2016 16:54:29 -0400 Received: from mail-db5eur01on0087.outbound.protection.outlook.com ([104.47.2.87]:58299 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752148AbcHXUy0 (ORCPT ); Wed, 24 Aug 2016 16:54:26 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=mika.penttila@nextfour.com; To: LKML , From: =?UTF-8?Q?Mika_Penttil=c3=a4?= Subject: [PATCH] bluetooth, regression: MSG_TRUNC fixes Message-ID: <9f92cebe-284c-47b1-1e7d-1ed6581b20f4@nextfour.com> Date: Wed, 24 Aug 2016 13:13:27 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [194.157.170.34] X-ClientProxiedBy: DB4PR01CA0044.eurprd01.prod.exchangelabs.com (10.242.152.34) To VI1PR0701MB2175.eurprd07.prod.outlook.com (10.169.137.20) X-MS-Office365-Filtering-Correlation-Id: 13e50862-9e35-4ff2-85c5-08d3cc074cfb X-Microsoft-Exchange-Diagnostics: 1;VI1PR0701MB2175;2:XipyWmw/eWdFwFa1TviQr13e/H0oURh8K8f/yJu2eOUEJ3Ml7BmUi7MzU44D/g16GJPwxQnCN/w9rWSQprA9nf0qG9Si5gbEw9SKmfbBz7NcVupjgpi4DP1YuiDmzg8/mxKbUtCw7GYt+jXCJpQ/doxT0+X4UX2E2XshxAAnZJQlzQDUbuT7gvYlqVyZ58As;3:uX2fV2W0ahyGDCRiMPy9SWrFeizqao560KNHf8ST2gTuorSU+idL69WVrKdafW8s/rMcpaWZiKQhBApuSZEt/lBDQ0qyaWwvanhaEa8oKi6AflDnBdjeleQriviVFxiV;25:LdBSE4wAavHmuY2Dd3JUrGN7KvGvLTBquGS2Osuy1p0TZzUN5POp7lg0c1ZLLA505KaAmYwqVqaSOyOwa2D9U7umGP67s+ZIYzSNqUCFuFZqu8C7saBGTsg4ILlhSa9oGMMnTdzDlXo5XWgwKxBDtXkWUGRBVSeFjFht8YD1ETB+fvtsuN8tCEIJbV2/h/jYK/gs9XXuV61YV3HdGHEDedXCebzWWH7Rp7P7meMENyK2U8SmX9OekzA96dvWZw+h0jIn8hQgEfBQYCFJrECNGHTOj87leL9ad2mHAZlEZhijcJxP4IcgOjZBwBSFh5xWRE5UwdEt37dmFVJCvoQ2aOzqlghzuc1gczRFo8vp8CUx6lRjq1cICGTHfiRO/8tD3Aq9HPIitEPc8V7KGswx9ZyQSYMqPOqEOhqEs3XK2D8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0701MB2175; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0701MB2175;31:l5u6BbEEbOyFutNemmv937cISkR1vetH5KhnKCNiuxrtY9GQ5KrTAxiOG33JbZo555NdQXP23RXjSMrUW+gNdLQhvSGuBIr/BYWa7lRcRioNW3Dwb8q6vCcOtUplsgL9v4dik2IKjhix0uUVo9955YgL64SYGW5qAnGOAqa/sn1/FUT2bX+RWLEZYg+0HOgZrQnsjPSw9NyYnjHrhlYiOdadiTr+5zCmYyj1f9jF+dQ=;4:dXnvDJn6yykGNWj7eopOTxwr+azSnHe4UDMpc7fn7uIpEKg291JEJ5j/bnWVixVp4Xec8Te+6ePaABuKYPwgLsbSkjbsFBDxjzT7M1LPRF/+mZIilKDk7K9qGVeMaI37xFYFO9OPafaWKuO/ZRTOIzT60CbRuDFguCeeCTHQLCqaDSDmKjwhvau+Cwi+pIDaskE6yjS5MgVPYM+fOzl3637z44Y5X1Sw2Gl7O2R1tTOfMkRUrqCvAbHqV9nxXmxfqdMjWpxXHVtXU11CctHm9393vYusMb4wzkZYuNWFylhovh/zZ98rU7qkANMMgtbTmvqRuJ4iSoFF3/HaX4NN/AUvoPMILpuYCWSGqmxSHp6ZOMkp/M4dgdeWEYK8AOilLTd3yGQCA3WmREdtjQOlkA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001);SRVR:VI1PR0701MB2175;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0701MB2175; X-Forefront-PRVS: 0044C17179 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(6049001)(7916002)(189002)(199003)(47776003)(36756003)(66066001)(65806001)(65956001)(33646002)(83506001)(50986999)(31696002)(7736002)(7846002)(586003)(77096005)(8676002)(3846002)(81166006)(64126003)(101416001)(6116002)(54356999)(50466002)(305945005)(81156014)(19580395003)(229853001)(189998001)(92566002)(106356001)(450100001)(2906002)(2870700001)(107886002)(5001770100001)(19580405001)(4001350100001)(97736004)(31686004)(42186005)(68736007)(5660300001)(105586002)(86362001)(23676002)(65826006);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0701MB2175;H:[10.10.10.110];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtWSTFQUjA3MDFNQjIxNzU7MjM6NEJwSE9URGFuc0tNb25TZC9QUFN5cXR6?= =?utf-8?B?MVRMc3B6dGJBNEJnRGVEZmhMQWxzZk1Sd2tEdDdkTHRBTG5hRE1DRGJKYWZj?= =?utf-8?B?dWN5QXNxRFdqb2ZkZXZNdE9Fem9NK2dIVE9yUTh1NUxGdzFtVnJVMWFJLzA3?= =?utf-8?B?UkVXUklQWlJSZnlkeTF0dFl1Vkp6QUpWYm14dTlCR1pMb05yclhuNUpwM29N?= =?utf-8?B?VE00Q3IxNk1PS3RBS1hYUU9ncEtPOXNiWHMwU3FoT3JTeWl1Vkl1enk2akEy?= =?utf-8?B?Umk0Ui9IMExoUk1QKzBWSjc0L1ZVeG4xamFaazEvcVpmeXZTb0R1RHBzUkV6?= =?utf-8?B?VGdvTG1PbXoxZjNoVStpek9XWFhkbnNoQ25PYkNIU0s5UGVQdmFnQS9YbTVN?= =?utf-8?B?SVZNU2xYcmhOMzVIU0FyRVFYdTE1eGVRczkxVGJPc0ZFekRjL2NERDcyK2tC?= =?utf-8?B?RHh5Mm1nM0RPVFhQUzhKdGhZb1lSakZwL0lsTWNkdXNxb2hzek0wUEVhUGpI?= =?utf-8?B?K2pTMG1QZXpzelFJMkJFV1UvQkY2dVFjdG5XL0RNcDFTeEd2eHVqZ0FEd0ZG?= =?utf-8?B?SFpBTWxkbG1sMWEyc2FQRGRsVzlXd3RKTDhNdGZIQWM5SnNFbFV1Rk5Yc1cy?= =?utf-8?B?d3NMNDI1ZHhhMC9MeE9KVzBBVzZUZ3BXdzd6bEhUWXhSQ3RwclV0NThOVjhk?= =?utf-8?B?Wm93ckMrZ0JrWHZrdk4ycEFzWUt5aHlid1pTNzJ0YkNLdmMvbXlIaW1DRnJU?= =?utf-8?B?Q3NxdGp4MXlpSXdTNW5wKzJtUTU5TlFTMHNIL2ZhdGQyT3ZQZWhCRlhJTTNu?= =?utf-8?B?V3FxYkJYaHJTUWFyL1R1UXd1eXM0QWZnRlVVUGlHakw0Z254UkV6U0NMN2Mv?= =?utf-8?B?V2pVVXgvWlA4dXRVM3VtZC9zdmJYeUVtTEU2Z0IxZnBMaGRDQm96anhhMVFM?= =?utf-8?B?eWlDR0wxSEFGbUs0OThCak4zbFlCUkllNkZzeXhXRmJza0VzUnl2KzM0RDlj?= =?utf-8?B?dW4xdTBVR3VPNlNxeU9QZ25YNkdZaCs0MGdydmwzZnN6WWlnMWVyb1V5UCtn?= =?utf-8?B?alVsa1A2UmJUT0EyeVB0OVNQVUxZYmRIYzFXZEtWaTVtWThSazQ0MkV0blha?= =?utf-8?B?UHdLaHJreFdaSTJkYnZPU0V0eTN1My9GbFVhdFowZk4rdXpFclZuRTJQbys5?= =?utf-8?B?b2tYRStIaGRPYTN3bzFGQ1F0TjBBdWtwUVV6aG1DdHZwY05OL2xtN3BJamY2?= =?utf-8?B?VmlJUkM3ejl6WnJ5U05Ba3NTSFc2bHlYNmNGRFBnZ05sMzFnMUJjRGkzN1Zs?= =?utf-8?B?dUlkcUNHZFFXb1Rpd3lJSWdybVppR3pHdEFURmhnMXpUSS9TWTZRUElDMUZv?= =?utf-8?B?QUtiQjJpU2RNM3RNanMycEFzWXZvdU9aT0dUdUdlTS9idE50aFNtR1ZKb1BQ?= =?utf-8?B?UTVxQXE1NnpzV2ZIMUR4b1J6YkVGdnlmcXAvek44ZzV3RTdmWmx2WUNPSVI5?= =?utf-8?B?WnNrMUFONlo3dmFYNkNabHJtREpONXZOT0IrWWlvbWtjY0dlTEVmTVNzZmNQ?= =?utf-8?B?cU1SUW5td2NvK0FTUms2K2xUMWJxZ1EvVlZYWGtwbzkzU0NXK01oK3lHOVl0?= =?utf-8?B?eHRHYnNaTW41Wm5aS2YrQW9rb0poeFVOVDRqblcvb3Nsc3AvTTUrSHpUNGxI?= =?utf-8?Q?k2LQaAS/RS3MEn4t8sxGrlMOCbBsV51PkdSHzEHlF?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0701MB2175;6:gBObR0Y7dG9pODx0c/cuzMAdutl44opHw8yOHCakD9UBmaMBdw5ser0QWUsE2F32L6S8AZ8bNcji/l2fytXBB4cEcLPOk+L4tlWJMCmWO9cyDpryB4lermbv6RECd0nVMNMVA0qGFYO453odGr+y1meKDPTvAlmKA5x/Cli3dIH/+e/2fL0s0btYYdF5j48jACSR9eJyk6LT/4kBymKNq2ayKvGt3apnxY08S4BM7WQYq+HJ5P6NbY2MsRt6eagt/XbFcXykRfFGdMC9M5aUu03bqT7eXGyEC1FfWPxAmY8=;5:scXj4kz5lfHXT/q1fXJOnmGOWy04dCxgodh1v7jEqis+JIdVcwT0RK4kwk7TAkqMzysrAalCZHSgu/4w9SBhGdHAxyI4auinrNV/u/Ak/wCVTLPKba/e7R1Y6tKXA/EEzdzVySh4x0JTH1g8Xj5Drg==;24:s+uDIR8B3iefz2xDDaxMDBXTCmXy51BySsOnc4C5aIBd6It7tneDCgI8419WqKVYfUafdRH/1wZ6yucDOTScZFdcqptHth3Ojd/uZzok+cs=;7:DHDMprVe9nZfffMtseLLFPg4W1sl4B8h2MEaMIv4AUnl6RotB+DiuggvXiV3wWBLNopgWvJxwRkhPRgjwOGtczQf62Js1ywg4PzC3zJ62x4v6t5sWfSVOSsptTA1vLhCMmsZ9VhDJe9E8bfWLUb57v/eBTM0YNiJ4ipEUReAeibi7Y45Vj9/0ZNgaQUhZ7XCd79koUViXizhWQA5vPny8Kgwjimjb9ikDJov3vBqg3yM1skQvsa9mKhNpOqb7HJ8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nextfour.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2016 10:13:31.4178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB2175 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Recent 4.8-rc changes to bluetooth MSG_TRUNC handling introduced regression; pairing finishes but connecting profiles not. With the below fixes to MSG_TRUNC handling the connection is established normally. --Mika Signed-off-by: Mika Penttilä --- diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index ece45e0..0b5f729 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c @@ -250,7 +250,7 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, siz skb_free_datagram(sk, skb); - if (msg->msg_flags & MSG_TRUNC) + if (flags & MSG_TRUNC) copied = skblen; return err ? : copied; diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 6ef8a01..96f04b7 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -1091,7 +1091,7 @@ static int hci_sock_recvmsg(struct socket *sock, struct msghdr skb_free_datagram(sk, skb); - if (msg->msg_flags & MSG_TRUNC) + if (flags & MSG_TRUNC) copied = skblen; return err ? : copied;