From patchwork Mon Jun 25 20:28:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jouke Witteveen X-Patchwork-Id: 934544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u7Ww+53E"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="t2xXIODK"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41F14D2ZMfz9ry1 for ; Tue, 26 Jun 2018 06:29:32 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Subject:To:From :Date:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7bseDxuOy/3jIeaJcFhlttzUcp0WsC0cNmhBOPjyd4I=; b=u7Ww+53EryfSzF cwJZJJJI5tP9hddjBj7K69gzvyPCp2YK9S5hE37MflpGzQC9FCa0bOMctTKKcNlGGZfgc+09dbDvI kZbGko1Dbik52bQcJE9ddI5o7hQSwnsUAZFjkI+zCyDqHJI698Y6wU2D8WkKELkl1MrNqW/0mv+mu 0uvfnUaTaNzhGdZixKkpyX9OfNBAEeF+M7BY5OIFNpJQMgEsK88L8Wo/oh203emk3v9i70OI+z2MZ A4oYIiCS6vG8iFAZNMmBFys2u9qj2yTnFPUtPP6Ur5BZ2FlyGdiFWkaUyCrypqXfgkDuG1iS0Pj8e JX8yMbO8hKjS6Lzudqaw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXY6p-0000SS-Si; Mon, 25 Jun 2018 20:29:11 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fXY6m-0000RY-Hx for hostap@lists.infradead.org; Mon, 25 Jun 2018 20:29:10 +0000 Received: by mail-ed1-x544.google.com with SMTP id r17-v6so6214683edo.13 for ; Mon, 25 Jun 2018 13:28:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :user-agent; bh=aPedi3Y5nHjA9PkDvJRHUl5qJagFcV7GF6+rYL+rl7I=; b=t2xXIODKL4R7w7ieZLMfvWQrhpXQaA9l8WnFjXQRi1UxBxkyBbLTMBNKTjN9GB9RUy k6m9pgJ+bYC+OAhwAhVlyRK5N8l8o9I0Duh1Abh+VYd2Tm69E1a+bw7Wwk2160qMWck+ FaI8oc/YFW16Yxx9q8yiHzjmkK5x/yoBGz8e//I3SAUHI6q9+DNN6XmTRTZecLFy6Viv deyUuN4BFzmhX+ISx9OdRoOs8fSv4SZhPM6KJI5xO4Dw0qBZHzMDZ7BBvs8yuXTKbn+y CR0NleYMPuO6LPJ5NgAo0lpXCvcBxM25GFaPrmfh0qdlBoDeOnsfWKpkc8H5O6nVr0ac pMUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=aPedi3Y5nHjA9PkDvJRHUl5qJagFcV7GF6+rYL+rl7I=; b=bSXo/n9WJGux1Tc9ook/pf5mSl3vNTNwfp6PnqP6r4u2MIVxRT+BLrffOaQL25+DYw b39zvozgycuwiMwscVgaxMGSzxHfraGjsftdPttSElYAoVyiTEM2OizPSI43d6vlz5H6 ZU9oijapkK5BlaksjrKB7VB/2IQWu19o27puqmZZXNceMLWZpMROii9MYvf/LLak1hUG VxxicR1v3vxFXBAb88D+pitc8DUleuFhAovQmetSKDQ+E/WRbBQvMGvYRWQTYPuCtWiv OGPm8IcIZ48eaF0skVfWcSjAtzia0/PO5rN2uU/9ykudmPYvhpdP15VmBhLlq8xRd7gZ YHEw== X-Gm-Message-State: APt69E2x2jkrt9XEHw+zv6uxfdMuZydVDpx6JPCyQGFbqOdQAqbOStmw h9KE854/fSMmRnjJeP2fbHhE5A== X-Google-Smtp-Source: ADUXVKI+yML0qi3Y2q26jKbeMOjYS0YpRP89wRBPiDBmgPvJL4S73UyKSpmSMXUq2FxqAsvocRQ9BA== X-Received: by 2002:a50:96d1:: with SMTP id z17-v6mr12353528eda.55.1529958535466; Mon, 25 Jun 2018 13:28:55 -0700 (PDT) Received: from Mindship-03 (ip5653397a.direct-adsl.nl. [86.83.57.122]) by smtp.gmail.com with ESMTPSA id t20-v6sm38807edd.93.2018.06.25.13.28.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 25 Jun 2018 13:28:54 -0700 (PDT) Date: Mon, 25 Jun 2018 22:28:50 +0200 From: Jouke Witteveen To: hostap@lists.infradead.org Subject: [PATCH] Fix coding oddities Message-ID: <20180625202850.GA4128@Mindship-03> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.0 (2018-05-17) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180625_132908_593613_49F936E0 X-CRM114-Status: GOOD ( 14.32 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (j.witteveen[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -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 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org One typo and one peculiar update loop. Signed-off-by: Jouke Witteveen --- I came accross one typo, which had survived over four years, and one odd loop in which a variable was updated at every iteration. If you dislike how I refactored the loop, feel free to kick that part of the patch out. Regards, - Jouke wpa_supplicant/wpa_supplicant.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index 185a8d50f..5865727c4 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1656,7 +1656,7 @@ static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx) break; case 4: /* Bits 32-39 */ #ifdef CONFIG_INTERWORKING - if (wpa_s->drv_flags / WPA_DRIVER_FLAGS_QOS_MAPPING) + if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_QOS_MAPPING) *pos |= 0x01; /* Bit 32 - QoS Map */ #endif /* CONFIG_INTERWORKING */ break; @@ -1691,7 +1691,7 @@ static void wpas_ext_capab_byte(struct wpa_supplicant *wpa_s, u8 *pos, int idx) int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen) { - u8 *pos = buf; + u8 *pos = buf + 2; u8 len = 10, i; if (len < wpa_s->extended_capa_len) @@ -1702,8 +1702,6 @@ int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen) return -1; } - *pos++ = WLAN_EID_EXT_CAPAB; - *pos++ = len; for (i = 0; i < len; i++, pos++) { wpas_ext_capab_byte(wpa_s, pos, i); @@ -1713,10 +1711,10 @@ int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen) } } - while (len > 0 && buf[1 + len] == 0) { + while (len > 0 && buf[1 + len] == 0) len--; - buf[1] = len; - } + buf[0] = WLAN_EID_EXT_CAPAB; + buf[1] = len; if (len == 0) return 0;