Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp2672688ybc; Mon, 18 Nov 2019 02:54:14 -0800 (PST) X-Google-Smtp-Source: APXvYqw2X2XijqKA2Rx/L25r8Ojii7Q9kE7bfVtagEzugLC0aVAAPHspH99fMCQQvKg6q9TyTujD X-Received: by 2002:a17:906:7750:: with SMTP id o16mr26143927ejn.224.1574074454718; Mon, 18 Nov 2019 02:54:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574074454; cv=none; d=google.com; s=arc-20160816; b=y9U7Ov5GXnXkrEPauEsOGo/4u9AsFzCPqK6lt1HH/SdWHKOsmYwP2/kc/KXsooLxxQ CBBzTUMnm1AD/4mMOKoK6101Ppkyya0mIocIkuiatiJ3uWEGi7YoG0zoG+ppJ3II0kuR s6HT2g5XiZsAmE6A3rLURA3tjti7MTgoFwwsf2U41G0Qwh7FghqENqW8eXW9xxLNKh0q 8cdEH+JBGiNYq/irH0IbAZPoq2xzS0BMs7W5U1MeQ9Rxn0wsp6IH68GjdAWtVq+5wrN6 uVfeLylpHOcT0xuvi0I21Mn/TgrtRGGrpGExIHDr3ZgN7RTqoNYpFWkrEPCyNU0NOd1B LgDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ZG9mkhY41A9aJo8uXnA3XR223mAbRrRtP+kn9Z03/Nk=; b=uwFRKvUPRzB6YnAyONaWdvnQ3ywmmc+QNJRaDVxhovOtyka4Wdlcu3OVdZ9r1V7TbF 7hbFiL4Xo48klbXz5HoyfkMHlUnEk9Ox3vJcnYa0doB11Xs07ePqI3rwHdxEq+nEvh5I oLDmR4kVWZo9vkP8N4ZbMXwUwWHE9R0MeRBvQPNFM7VhZbAp/mEfbHUY8HTwW8oDfbDC NpGFwav5QkZh/yKcrquNsEsKY6g+9ldQ/lEaEG2wG00i99dgy9EuyC+fcg9FD27PEClm sdiNabV8yc9jshsNA9eQt1iUHgtIQK9nDNyCYGAq5WcrnT+k87YSd8uEY6bT1uoivtDe PyRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@silvair-com.20150623.gappssmtp.com header.s=20150623 header.b=wKtJWqXx; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o3si14791462edi.374.2019.11.18.02.53.38; Mon, 18 Nov 2019 02:54:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@silvair-com.20150623.gappssmtp.com header.s=20150623 header.b=wKtJWqXx; spf=pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726596AbfKRKvi (ORCPT + 99 others); Mon, 18 Nov 2019 05:51:38 -0500 Received: from mail-lf1-f50.google.com ([209.85.167.50]:38261 "EHLO mail-lf1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726595AbfKRKvi (ORCPT ); Mon, 18 Nov 2019 05:51:38 -0500 Received: by mail-lf1-f50.google.com with SMTP id q28so13412859lfa.5 for ; Mon, 18 Nov 2019 02:51:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=silvair-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZG9mkhY41A9aJo8uXnA3XR223mAbRrRtP+kn9Z03/Nk=; b=wKtJWqXxluyGtE+zLqa4yY3rcvS7VFF2zpBmBsF0thlG4zHfADRAsx24yYLqPurfh1 v01axuqVikXpHaPeuja9oq8g/jA7QAwi3EVmkVV7E+XVXmu3kEoEMhw5y1HyvoHGkV8/ ++fIQlKayIZ1YvalPprewYfDfJx4vvMLUH88JQadT80Cfno8glyf1QoKTsHA5l63sTHi SKc5LhzmMOy5db4Nr2AWYbBIg4ItuwzlSD6SOyLl+blUwaxN6nLQsbVv7IiKIUbJgKOZ PaIdE1BDWlQ9ea6dOyOagmTBLkU5fmmV0azGMinV0mKvCgDp+qAaZWAGwZSzz8WvV8Oc 2G0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZG9mkhY41A9aJo8uXnA3XR223mAbRrRtP+kn9Z03/Nk=; b=nWQ+lV99lIW15s2VYy7VEXCuxoGvhH1u2AifjnGpoWTufXfP9KVTcF//fQBaKbipJe Evbxa9XD+C9xCO6gUHNWKqK+ZyinAgC26qs7WpPm7eqs/L7RA5FHvJ8HJZZTfeoo3JqO UFcEjIYxdeghdjf3tlIMqBVpYfAP3nLbIn3rFa3N4RgEx5DmZcHEcQUeL2eM58JuanQT 9GVCS0R7leoAVZT4bJQm0rP4iZWxpGD33uWntiCeMfWdpfxqhtsB1Oj20JSw7Weahua1 ZGLHfgKOK+aBfSf7kgE6gWoOdD+2C6R+++emFhJ8I3JJEC6mOOQzsYebOD43DgEG+8TE Kp6w== X-Gm-Message-State: APjAAAUx2v3+qRVHYN3kXALg5vdhibG8Vyl2MstsQhvYZePREj1V2lfY oKRONKh6SM338uYF+KrW6Bj/WLSOcmFTgQ== X-Received: by 2002:a19:800a:: with SMTP id b10mr20822316lfd.15.1574074295299; Mon, 18 Nov 2019 02:51:35 -0800 (PST) Received: from mlowasrzechonek2133.silvair.lan ([217.153.94.18]) by smtp.gmail.com with ESMTPSA id j8sm8075766lja.32.2019.11.18.02.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 02:51:34 -0800 (PST) From: =?UTF-8?q?Micha=C5=82=20Lowas-Rzechonek?= To: linux-bluetooth@vger.kernel.org Cc: =?UTF-8?q?Rafa=C5=82=20Gajda?= Subject: [PATCH BlueZ] mesh: Fix crash after deleting all subscriptions Date: Mon, 18 Nov 2019 11:51:18 +0100 Message-Id: <20191118105118.28881-1-michal.lowas-rzechonek@silvair.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: RafaƂ Gajda --- mesh/model.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mesh/model.c b/mesh/model.c index a06b684a5..40c5e6b18 100644 --- a/mesh/model.c +++ b/mesh/model.c @@ -1426,9 +1426,8 @@ int mesh_model_sub_del_all(struct mesh_node *node, uint16_t addr, uint32_t id) for (; entry; entry = entry->next) mesh_net_dst_unreg(net, (uint16_t) L_PTR_TO_UINT(entry->data)); - l_queue_destroy(mod->subs, NULL); - l_queue_destroy(mod->virtuals, unref_virt); - mod->virtuals = l_queue_new(); + l_queue_clear(mod->subs, NULL); + l_queue_clear(mod->virtuals, unref_virt); return MESH_STATUS_SUCCESS; } -- 2.19.1