From patchwork Tue Sep 24 07:59:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1166422 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.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46ctsS4d6lz9sPD; Tue, 24 Sep 2019 18:00:28 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iCfkF-0007Rs-M2; Tue, 24 Sep 2019 08:00:23 +0000 Received: from mail-pf1-f195.google.com ([209.85.210.195]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iCfk6-0007Kk-PG for kernel-team@lists.ubuntu.com; Tue, 24 Sep 2019 08:00:14 +0000 Received: by mail-pf1-f195.google.com with SMTP id 205so833663pfw.2 for ; Tue, 24 Sep 2019 01:00:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5WdqhCOgdEEQ62PqderdLy9ir04GbNE+j2PzDuvFV+E=; b=d6Amjza65SinJhCbIl20ECiIG0Bmfx3Z2qQKXE4IQRTrhM4DmGP0KFosHGZst1jUZt rRUJxgA5KDwSGQAh3F0n6Ypk6jPa5+Toe5GKp3OHRG8WmwX+4CZrNLjM/2wqfbPGC9Xn ny6FG/b7CF9xZS+L8yzioGnz2+wBmxu0YKI0OWtMzZULgAPLLitTC99Y4DDbHPc5zSuX sjg6fVUCDBV43VFNakueNhaMWOfXAaQUFuX4mOSISBa+V65TcOF2LM2xQm6XuvSulSqy SZTjOxk5dvaDb3n7p5QWUtsm/WEmnx/0ZtrmgfvliGLsP1wruBV6oVKIs6t4LOhv9btg d+uw== X-Gm-Message-State: APjAAAXsKnyRygJTLFZKwr1xstzsxiE7Lq4zrOiDyKsakiQrbZC79Lgp 2dZLAtSlRRQcz4BBBTW4gpbYHtfa X-Google-Smtp-Source: APXvYqwoZAQ3eA3Nh+hhv9LRarMc+r7pF3PaKiUoo/pofrGtwyzfGnvK/7OtNvEjkEE53el/45sUwQ== X-Received: by 2002:a17:90a:33e7:: with SMTP id n94mr1609483pjb.15.1569312012764; Tue, 24 Sep 2019 01:00:12 -0700 (PDT) Received: from localhost.localdomain (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id g202sm1359780pfb.155.2019.09.24.01.00.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Sep 2019 01:00:12 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 02/21][SRU][OEM-OSP1-B] mac80211: use element iteration macro in parsing Date: Tue, 24 Sep 2019 15:59:28 +0800 Message-Id: <20190924075947.33954-3-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924075947.33954-1-vicamo.yang@canonical.com> References: <20190924075947.33954-1-vicamo.yang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Johannes Berg BugLink: https://bugs.launchpad.net/bugs/1845138 Instead of open-coding the element walk, use the new macro. Signed-off-by: Johannes Berg (cherry picked from commit c17e28d1bcd357219264aaab37d5daba8181f9d3) Signed-off-by: You-Sheng Yang --- net/mac80211/util.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/net/mac80211/util.c b/net/mac80211/util.c index fa59dda7feb0a..09392cf4f9559 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -895,8 +895,7 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, struct ieee802_11_elems *elems, u64 filter, u32 crc) { - size_t left = len; - const u8 *pos = start; + struct element *elem; bool calc_crc = filter != 0; DECLARE_BITMAP(seen_elems, 256); const u8 *ie; @@ -906,18 +905,11 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, elems->ie_start = start; elems->total_len = len; - while (left >= 2) { - u8 id, elen; + for_each_element(elem, start, len) { bool elem_parse_failed; - - id = *pos++; - elen = *pos++; - left -= 2; - - if (elen > left) { - elems->parse_error = true; - break; - } + u8 id = elem->id; + u8 elen = elem->datalen; + const u8 *pos = elem->data; switch (id) { case WLAN_EID_SSID: @@ -960,8 +952,6 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, */ if (test_bit(id, seen_elems)) { elems->parse_error = true; - left -= elen; - pos += elen; continue; } break; @@ -1244,12 +1234,9 @@ u32 ieee802_11_parse_elems_crc(const u8 *start, size_t len, bool action, elems->parse_error = true; else __set_bit(id, seen_elems); - - left -= elen; - pos += elen; } - if (left != 0) + if (!for_each_element_completed(elem, start, len)) elems->parse_error = true; return crc;