Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Iulia Tanasescu <iulia.tanasescu@nxp.com>
To:     linux-bluetooth@vger.kernel.org
Cc:     claudia.rosu@nxp.com, mihai-octavian.urzica@nxp.com,
        silviu.barbulescu@nxp.com, vlad.pruteanu@nxp.com,
        andrei.istodorescu@nxp.com, luiz.dentz@gmail.com,
        Iulia Tanasescu <iulia.tanasescu@nxp.com>
Subject: [PATCH BlueZ 1/4] btio: Handle closed channel in server_cb
Date:   Mon, 16 Oct 2023 18:48:57 +0300
Message-Id: <20231016154900.3094-2-iulia.tanasescu@nxp.com>
In-Reply-To: <20231016154900.3094-1-iulia.tanasescu@nxp.com>
References: <20231016154900.3094-1-iulia.tanasescu@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bsM/mJho3SYLzi5rX1CmMQXpPAtoM+iW91PQSv/7nxZKjcaupHp1HjCj3II3?=
 =?us-ascii?Q?tjQAZznPkNg7cfoH9j8b38BMLxWtiLvU8DBdvph3J7REz7I5IC7HUzB0EO2r?=
 =?us-ascii?Q?hWRlFa/XR/nxWYzMz3ZBIT/UJYOU/2CcajAzqS/iVastIz+CzhLmbDf+MpCr?=
 =?us-ascii?Q?7dMCZHGtYuKrh3w4qhyDCf/tmXUytTNYMubIZcUkNx/DsR/Uei8qw26+B/9t?=
 =?us-ascii?Q?jPar+CSVem7QHRiB5xQ6zKGYfEm8tr/NXZ5G2BNBUAsyknv9hGZpH4j8n8ia?=
 =?us-ascii?Q?hlbKJ/v41Bic+5CE7J8zxm/X63hHuCjiNiYiBsyKZprZCbtY0CUg0+TWqv59?=
 =?us-ascii?Q?Hys/9dfXXvWomH4rWW8PqgAfx19Rs/aWH1v9ADc/F3SurFJOg3DkAvAL9DCg?=
 =?us-ascii?Q?p68loSYC2+Vln/nUIRFl2myPv3WZ5UrmitZgaxKghs2h9biUEm+czl0hKkwo?=
 =?us-ascii?Q?Eb03BCte7qM7NmmfD03ab8o53ZUceTgLDhBMKF19jYt1LKch93Gl2Os71Vuq?=
 =?us-ascii?Q?1Y0lSKasai9pDaLjhfayprD9SwdEWkb3FHHfC3bXyXPBp9OiZeE4a7DmPkGf?=
 =?us-ascii?Q?COfJjRiovxJVqp4P9KEQ0E5mUrHd5YzDQbtml3Y2tBCQ49bOUiR46a52eGd4?=
 =?us-ascii?Q?EYLpL+K3gz0KlSHkTU/83WLH2ctEZk+nRTfOoCS6lsXyDBnrOUdiWcx045Li?=
 =?us-ascii?Q?wnFTNVVZSUJavacSvIW4dZBu6Lkgq9IWdlRnlXnWvOYx+ET74OrtYYpSNDCi?=
 =?us-ascii?Q?D7UiO6NQbuF9r+KwKFfWOwv5hTjKi3rScbuMS7yjURRTuVtRqiP3yZN5X9wV?=
 =?us-ascii?Q?GeazFx7q8qM9PsRpRoTy6q2qrzX9kPRr9+cwVtLhGsRijhRRMmTlMydY0Gi0?=
 =?us-ascii?Q?ZSEEjuUmmMU3xm0ArZ9rUQlLn4qeHuOohD4HYJ/dchbDbSjkIp/TpfjhYkr2?=
 =?us-ascii?Q?q+Y+02m3+dNfOd8klFBpuMSp7nCmiqiKyH/rUCFQB4K9pshqxqwa/6U1T3jT?=
 =?us-ascii?Q?M2LXh7Cqd74CEpkmJ3VaPDf611lln1h3Td/op2YujOH+vTIzTJ80+aBSWc/A?=
 =?us-ascii?Q?y0bLRWqm3WKdtsuqXockmB9h1KSbPwLJVM/RR36/fnDsLvlZ4rKVeeaD5+Ar?=
 =?us-ascii?Q?BuMjt1Brzn2fFZV3e1uzmkxSKAS23MV3OT59CAkILEtgoqVxakVRcH2K3CsB?=
 =?us-ascii?Q?Q6lkNpxQfoGHzmot48LLTuKd4Ct8enx2OKZ0PJJCGf8LNFU4ggoJni7hu2DC?=
 =?us-ascii?Q?wd4axol2LLTJVXVSSMPcNlpJyNUQBEPHAHrE+61muHwiWJkjVNAZZCDmQBW9?=
 =?us-ascii?Q?kiDfkXyxYfjf1lLtdspWug7UefTBz+XXhbF92s1JKIZYomFUS1MYzMQXU/p4?=
 =?us-ascii?Q?f0xu+Q1nn/PLfVvmKJoIrgoQyhUyIvv45LJlsSOYyzQHCgNXy7rn1UpOPoTG?=
 =?us-ascii?Q?ofQOxmfKfqdBnQ9GQD/srLGAvAQLa5P7J3v3g+3DJJ7/+nSBmGDRgXUMDyEV?=
 =?us-ascii?Q?4O9gZ0DCMzqx8GjLOEEWb6metl5HJuNgIz21qUYryMAymkhtNln4DjpsEujX?=
 =?us-ascii?Q?Ag6Tr+f7gVTmxV5q8VAj3hmCoRsqeXPtgZU06UKG7ohnFt9sWCijKsWmYM/h?=
 =?us-ascii?Q?wg=3D=3D?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fda69e90-e83f-482a-81ba-08dbce5f6f87
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8898.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2023 15:49:09.2401
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: o8XYfzrP49EG4kSJptoO6KEbZETfC1BfjFH+exPpWJKQu3ZlWBG15qSoRXJX8zeukXe43rdyP2+jZVB2WWJE4Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7423
X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-bluetooth.vger.kernel.org>
X-Mailing-List: linux-bluetooth@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Mon, 16 Oct 2023 08:49:17 -0700 (PDT)

This handles G_IO_ERR and G_IO_HUP conditions in server_cb

---
 btio/btio.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/btio/btio.c b/btio/btio.c
index d45b8240d..c63a6d1df 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -247,7 +247,8 @@ static gboolean server_cb(GIOChannel *io, GIOCondition cond,
 	GIOChannel *cli_io;
 
 	/* If the user closed the server */
-	if ((cond & G_IO_NVAL) || check_nval(io))
+	if ((cond & (G_IO_NVAL | G_IO_ERR | G_IO_HUP)) ||
+			check_nval(io))
 		return FALSE;
 
 	srv_sock = g_io_channel_unix_get_fd(io);
-- 
2.39.2