From patchwork Tue Jun 23 09:59:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason A. Donenfeld" X-Patchwork-Id: 191422 Delivered-To: patch@linaro.org Received: by 2002:a54:3249:0:0:0:0:0 with SMTP id g9csp906069ecs; Tue, 23 Jun 2020 03:00:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxIbJubkPCL8zX/Mn1fpUglcEH3HxzDSypiGpIrWoiaf2Hp4W+Cmh9v/xHvYh+KsvUCe9g0 X-Received: by 2002:a17:906:1386:: with SMTP id f6mr19551292ejc.66.1592906404167; Tue, 23 Jun 2020 03:00:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592906404; cv=none; d=google.com; s=arc-20160816; b=0lE7kaHdQkQFaxttK8YoM1ZbloH074+j54F8sQ8pcg0PCS8MqG6WsaG1afI8hJzv8X tRSdEauE44DGjNCzDvtPDLCdpwWIh5fl3hdgzkAXJvOzRjzs1R/i9xHhShg0xNkLAmK8 /r7XLdwy5zajT4SeQyQQG78HsiMQ9dMT9boclBZ9jqCzr9qHDvER/ZumGIQXriksKWtx ySD1MU8fjMkik/VhFdjAqzU17P+SpOTn3fHF3wWcrMqESkeWu4cKCjwrfCOmsnYWus3w LY13pbaMFgQMFL4HLyjDVhiUK91uf9GxWKO4FMRKAGJvCCZ72DVEYYqC8HdL85+c/FAp Fszw== 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=F0FeongA7Y8ATRQOiEjRiUWMj2C8pBar8usZWJqv2fY=; b=UnLS6v5RJJJ7CWuSRwGf47NtnOuyI/DXPz8dn452ANWYrqECr88GZuNKhwo7rC0f0w LQX5gAHBZKd+jgbfYQLmAPTmxQJ17Oy/pPlaqEA/Lfbq0AGGZaqQKnFIFueKnojJl3Zc VX0FM73YhDQ/CySU9/jwpRQ+WBw54ncBWD0qtI+ZBvzicgBO3U3q8fJ3jTWoMSxQG/qC ba3JzxNei/iHlX3R8QyqIMITjrn2XVq44Ae4YskwxnIrzdnnZ7fI1v3Kxui9mVRlVzKb 72vSCfwb3E3L1rtuct2BZ95MACSZBIigkXj2Aygc5BId4SGxjlvhlJlU3IdY3IElhCIl 0Swg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=qAZRlfUU; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i1si9699561ejr.634.2020.06.23.03.00.04; Tue, 23 Jun 2020 03:00:04 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@zx2c4.com header.s=mail header.b=qAZRlfUU; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=zx2c4.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732204AbgFWKAC (ORCPT + 9 others); Tue, 23 Jun 2020 06:00:02 -0400 Received: from mail.zx2c4.com ([192.95.5.64]:42093 "EHLO mail.zx2c4.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731947AbgFWKAC (ORCPT ); Tue, 23 Jun 2020 06:00:02 -0400 Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTP id f5c9a53e; Tue, 23 Jun 2020 09:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=zx2c4.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=mail; bh=4dopyPj/KdCR6a3iZO+zjrh02 zQ=; b=qAZRlfUU8zV1RAgK6sDqnfnOgoVmFFjMVA4I/hM3GNWp2OtnnwBhSAfhc hrSMUFCYwA+SxiG65aG2oG+1m5Zoa9yISFPD8c64rFn5CF0PwqxAJuxNGwQlWehr UgXtj9L4KkEMBFJcSaZWAUj5UJH2uiCmlxQVc2I2Ibh2EDJFuNUrYaGghzVmrdxD H28eFnoEEqwOOr7r49txR8a73xeh3oYNaqMsl42q4lG3MzViMnxeNWM4zB2p0LKd fNFMmypOvGRdOxQaCZSSJlHSdc+CY8yMtdLlPVvD8TU6SSFYHhAFQAGCLnw5ulll /y6eOzq6o/e6GS0lUvwVppElZV/CA== Received: by mail.zx2c4.com (ZX2C4 Mail Server) with ESMTPSA id b3d3d1f2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Tue, 23 Jun 2020 09:41:08 +0000 (UTC) From: "Jason A. Donenfeld" To: davem@davemloft.net, netdev@vger.kernel.org Cc: Frank Werner-Krippendorf , "Jason A . Donenfeld" Subject: [PATCH net 1/2] wireguard: noise: do not assign initiation time in if condition Date: Tue, 23 Jun 2020 03:59:44 -0600 Message-Id: <20200623095945.1402468-2-Jason@zx2c4.com> In-Reply-To: <20200623095945.1402468-1-Jason@zx2c4.com> References: <20200623095945.1402468-1-Jason@zx2c4.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Frank Werner-Krippendorf Fixes an error condition reported by checkpatch.pl which caused by assigning a variable in an if condition in wg_noise_handshake_consume_ initiation(). Signed-off-by: Frank Werner-Krippendorf Signed-off-by: Jason A. Donenfeld --- drivers/net/wireguard/noise.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.27.0 diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c index 626433690abb..201a22681945 100644 --- a/drivers/net/wireguard/noise.c +++ b/drivers/net/wireguard/noise.c @@ -617,8 +617,8 @@ wg_noise_handshake_consume_initiation(struct message_handshake_initiation *src, memcpy(handshake->hash, hash, NOISE_HASH_LEN); memcpy(handshake->chaining_key, chaining_key, NOISE_HASH_LEN); handshake->remote_index = src->sender_index; - if ((s64)(handshake->last_initiation_consumption - - (initiation_consumption = ktime_get_coarse_boottime_ns())) < 0) + initiation_consumption = ktime_get_coarse_boottime_ns(); + if ((s64)(handshake->last_initiation_consumption - initiation_consumption) < 0) handshake->last_initiation_consumption = initiation_consumption; handshake->state = HANDSHAKE_CONSUMED_INITIATION; up_write(&handshake->lock);