Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp1209736ybl; Wed, 8 Jan 2020 13:01:34 -0800 (PST) X-Google-Smtp-Source: APXvYqypSxcp++k2DY0kn9fV+W1ZbVV+dJeijVSXDVHgxdjc2NCTdEdCu2E1FkvxGaUEMt3qYXkI X-Received: by 2002:a9d:7586:: with SMTP id s6mr5547089otk.342.1578517293965; Wed, 08 Jan 2020 13:01:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578517293; cv=none; d=google.com; s=arc-20160816; b=WVBU5m3VXOdHi0g9+0rFqCsrZjzOHEph/bqdqpDpmHaKhbOFXpf8TPlLcFrGuK1biG DoMjerbB2nEioPzpzb/5scwzyrTcfTE6bY0xXJR/DmGwklsJB6U2bGvo5l1OWAdXuXdE JuWri9p8NIl3k1QyWpSfQqtvAm/JqjXiLvXqJnWqTVbHS1NcgeY0oeMaeBPLXX3gJyQ5 U8GlWLg0rI5WUIU2kLjVTE+h99Voed64XrEym3i/y8Mb9CEUTX9YWhGpFmBjibmJ9Wva ioS2+r723xaUaS7XfwXPFaJMPk3NhDX9kOqofIUPowUrJfWs4YyOhM4ZGvVVslc+sJ/J y4Zg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=86tQQFoJuyx30gvEgh9kjWt7y0yJSEbwFKiGrXdjYhw=; b=ZAEacnAH3ZCxFnih3h1D4XieNH1x8N26uDpYfVbpLg1JLi6mkgxltBh85NwEWwVBLQ RNpxAXI/334tiYt3DQQqi89TrlCiotTRSaxBxNNU5sf+mB4Xh12fzPCHMoIpiH8YFlww 1LI2xVwUxYrNmW9WQheMMgdxblWPJMAevi/SZKHDMbXiLVDqXTvRGMRsUGxtniP06lkg 5LqpiBjpmlCpB++GyU3f+39zA+hgqOfzEpj4Fiz5v9kRDEA1+S5ZNbxHYva3PxwhSs5f J0qAC4fyGeeu4E6MZvnkFaIXMRWXkKRnjplAr9YSUtPoyXThQNJOLfXQdgsoURYsI1wd MSlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@silvair-com.20150623.gappssmtp.com header.s=20150623 header.b=ZaTLlk8k; 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 b10si2453712otp.124.2020.01.08.13.01.17; Wed, 08 Jan 2020 13:01:33 -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=ZaTLlk8k; 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 S1726583AbgAHVBP (ORCPT + 99 others); Wed, 8 Jan 2020 16:01:15 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:37758 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726155AbgAHVBP (ORCPT ); Wed, 8 Jan 2020 16:01:15 -0500 Received: by mail-lf1-f66.google.com with SMTP id b15so3517783lfc.4 for ; Wed, 08 Jan 2020 13:01:14 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=86tQQFoJuyx30gvEgh9kjWt7y0yJSEbwFKiGrXdjYhw=; b=ZaTLlk8k2aUI4QFEpHbIDk1QUjqGMPtojEYRLFRv2fcxucdTWYPFKLnqYo0UbWVT17 PWABxhxR2RQptd72Sm6x53nLnhtkFA3GLtlRqPM6yD2yodNvF1CzUikEiFXOKLDzd/D8 dIie0dkzC0Od3W8Z3/Qhc3pasYOXbJhTOBKkoJUbRzViUJsC77N62xTZ4Z7Of3oymLC5 gTI1sug1EfsIHCWFtNqbzJV+4V77Elqj+S/H8ts2vJJxsxUEu55KD2E7OPA+fdIgJCAA bwcSXKQe2sBDv8IAaQs6QGaRkeWcHUNdcK+xQyRpWU1uySMHT4aAnPY7JGz38V9d/Qcy rCng== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=86tQQFoJuyx30gvEgh9kjWt7y0yJSEbwFKiGrXdjYhw=; b=KdQ8lMzGklG6dLPFLdEQoYcKwrWzHalpDXWqNcrybYbwkUAbtf5eH+gdnPL/Syv4Eg LIops59NzVEaDGUt7uNgOR3Prg3rQbm5/wn76QgMnIdR3dkZ6Wixx5CqVIBz6q9BZQFZ 9piz/Zv/Etv7jgwDow10TUFxlOOZuCK6YVodm1d2YmeNO9JpZWZgeVpNmWSKLryEBbAA eR9vXriGopgWIHsAKkAVNTHjGG5J84h5fcw7sMJQGcjNFpzMpwt6NU4nIV7G9WgzOUF0 2ZhB1Y4LgdmsblEXzOBK/pYF1eWvVmhe6Hx1oKgOyd+4IuTGFe7TBHmasOUFT7iVKj79 fCYQ== X-Gm-Message-State: APjAAAVdj8s8cyThpStsPNCwwJmSOgDZiGmsXdf6hKeroWz6cpPuKJ7/ 1oeomhJMaZxWNNRGCHHPRCj8aBUM6mY= X-Received: by 2002:a19:2389:: with SMTP id j131mr3812788lfj.86.1578517273316; Wed, 08 Jan 2020 13:01:13 -0800 (PST) Received: from kynes.internet.domowy (apn-37-7-124-67.dynamic.gprs.plus.pl. [37.7.124.67]) by smtp.gmail.com with ESMTPSA id w19sm1951773lfl.55.2020.01.08.13.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2020 13:01:12 -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 v2 1/2] mesh: Fix IV recovery Date: Wed, 8 Jan 2020 22:01:02 +0100 Message-Id: <20200108210103.32220-2-michal.lowas-rzechonek@silvair.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200108210103.32220-1-michal.lowas-rzechonek@silvair.com> References: <20200108210103.32220-1-michal.lowas-rzechonek@silvair.com> 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 This patch fixes saving IV received in SNB to storage. Previously after creating new node with IV 0 (or loading node with IV > 0 but after long inactivity) first received SNB should update IV (and reset sequence number to 0 if necessary). The bug would prevent new IV being saved in storage which resulted in sequence number being set to 0 on first SNB received after every daemon reset but IV never being updated. --- mesh/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesh/net.c b/mesh/net.c index 23565c11d..d7ce5493d 100644 --- a/mesh/net.c +++ b/mesh/net.c @@ -2657,7 +2657,7 @@ static void update_iv_ivu_state(struct mesh_net *net, uint32_t iv_index, if ((iv_index - ivu) > (local_iv_index - local_ivu)) mesh_net_set_seq_num(net, 0); - if (ivu != net->iv_update || local_iv_index != net->iv_index) { + if (ivu != net->iv_update || iv_index != net->iv_index) { struct mesh_config *cfg = node_config_get(net->node); mesh_config_write_iv_index(cfg, iv_index, ivu); -- 2.23.0