From patchwork Mon Mar 23 18:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Wetzel X-Patchwork-Id: 1260221 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=wetzel-home.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20170209 header.b=rj4R0FO9; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=wetzel-home.de header.i=@wetzel-home.de header.a=rsa-sha256 header.s=wetzel-home header.b=isjVHBnR; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48mNYS29s0z9sP7 for ; Tue, 24 Mar 2020 05:43:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=OvlYXn0RZTU6hVJ2Anbye5p2tilmncigg//UobQcK1Q=; b=rj4R0FO9M3Zzvm 3w7PfQqCHhLYKCAnd+Q5UYVGvOMhmwY3Z16u+k+00fhjlAY9gofEs6Q56c2xFrUZ1/TP8zE7X7PlW GJfypLaE0RRihJug/oULb2ZiI1XdQED0giy4+JToqK1S5hncJraKNxCwvO4mhNWK9CDssbTP1/jFu g8d1CXlqHbB5jeYec+7ZZAxdRFjbx9LHrb0DY3rLth0vLGvhDfYj2ZzpP2infXHMYLImpEwGJ6CmA 4q8scDy5pnF2DI3i3gIJuV4G3xDVQ9kEpLZwN3LdXUtIEtupZEN7WwzQHj9YaWNs7kE/h+fzXb6YK 0anagMoNa2+tZEb6IFaQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGS2G-0005DL-63; Mon, 23 Mar 2020 18:42:52 +0000 Received: from 11.mo1.mail-out.ovh.net ([188.165.48.29]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jGS2C-0005Cq-OJ for hostap@lists.infradead.org; Mon, 23 Mar 2020 18:42:50 +0000 Received: from player695.ha.ovh.net (unknown [10.110.103.129]) by mo1.mail-out.ovh.net (Postfix) with ESMTP id 253C71B68C9 for ; Mon, 23 Mar 2020 19:42:43 +0100 (CET) Received: from awhome.eu (p4FF9153C.dip0.t-ipconnect.de [79.249.21.60]) (Authenticated sender: postmaster@awhome.eu) by player695.ha.ovh.net (Postfix) with ESMTPSA id 7FD501099593E; Mon, 23 Mar 2020 18:42:42 +0000 (UTC) From: Alexander Wetzel DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wetzel-home.de; s=wetzel-home; t=1584988961; bh=oK3ou2H6hPD7ng2125222RQ4KFLUyOnHejeCWTvRubw=; h=From:To:Cc:Subject:Date; b=isjVHBnR2+emmDCz/RDgrH89coC1IbnARHk1/VEqGX36plmcmSLaqpOgIQkqrSWdG dpIQ3rrDyFuoDKWvusPID6E2gry7CjFYJh91T7rQOaUU2iiMIWbDcErV6Kd0og/siI gJ8ZIizw+NCUp6dt28j20HonR3fKHowTci3eW7IE= To: j@w1.fi Subject: [PATCH 1/3] AP: Fix Extended Key ID parameter check Date: Mon, 23 Mar 2020 19:42:26 +0100 Message-Id: <20200323184228.10798-1-alexander@wetzel-home.de> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 X-Ovh-Tracer-Id: 226024408835497152 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedugedrudegkedgudduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeetlhgvgigrnhguvghrucghvghtiigvlhcuoegrlhgvgigrnhguvghrseifvghtiigvlhdqhhhomhgvrdguvgeqnecukfhppedtrddtrddtrddtpdejledrvdegledrvddurdeitdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehplhgrhigvrheileehrdhhrgdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomheprghlvgigrghnuggvrhesfigvthiivghlqdhhohhmvgdruggvpdhrtghpthhtohephhhoshhtrghpsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhg X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200323_114249_084905_36BD718D X-CRM114-Status: GOOD ( 11.08 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [188.165.48.29 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [188.165.48.29 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: hostap@lists.infradead.org, Alexander Wetzel Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Check the new variable to be set instead the current setting. Signed-off-by: Alexander Wetzel --- Without running any tests I have just three changes which look odd. The others also look ok and I'll make some test runs to see how they play out. The first issue in this patch looks like you got distracted when adding "val" and then missed some replacements. hostapd/config_file.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hostapd/config_file.c b/hostapd/config_file.c index 2bc0679b5..8b9b43f9c 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -2872,10 +2872,10 @@ static int hostapd_config_fill(struct hostapd_config *conf, } else if (os_strcmp(buf, "extended_key_id") == 0) { int val = atoi(pos); - if (bss->extended_key_id < 0 || bss->extended_key_id > 2) { + if (val < 0 || val > 2) { wpa_printf(MSG_ERROR, "Line %d: Invalid extended_key_id=%d; allowed range 0..2", - line, bss->extended_key_id); + line, val); return 1; } bss->extended_key_id = val;