Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp237870ybg; Thu, 17 Oct 2019 22:09:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqy1E6gVJdDx/uBSC+7AcdUcXiDs4lLTO4JdYof4+I4bhbBpcGvoUNkgqaTLXNd9uyuhQSxC X-Received: by 2002:a17:906:250d:: with SMTP id i13mr7082592ejb.275.1571375379329; Thu, 17 Oct 2019 22:09:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571375379; cv=none; d=google.com; s=arc-20160816; b=JESsaDm0hlyWeGHiErd4DjYSMkKDBopf9m8RLTRzSnKkDpvj1l6Z9niUsidua5RUMV LmHy0SByDckuiZ9Si8TknwDFk6rNLI5zagKjWoSFws2Wt5cGghbjBStlQ3vDzMuziwFi gKxpqPPG1TPyKrtcnqniHexbS7fDWoD4xpnOTph/3DacMBmijV9mf8E1+FEzsiDUsqZg ayZi+ljAXkXqwdAs8p5bn1n01+ah2P2ra5/QHYQdtDIzvOoxvpQ+saM0E2OzKulTCB3r 3bO/wzcq2zrOfoAeJ9bFfRfJgM77rAvZq92ZNUDXyj2EMzAWqjavuy9uEXamRVwEw9Pb tQnw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BA2M2kFDE3VL/dWjV38TRhm2QJcgINN02eNWvLdbe9w=; b=HOoUaiqJLCBaRolAAaSxxMECgabkPnwuq+59PSA6XTN8D6wNLtN1QbSSrjjNfsmHa2 S+us71+RrQNCx5lIK+2UN6FlNf08ghraJJRHdXbLZMxh5sJNYRvTgskLCFfKwziTEiTh HFBxekXortoZUpbFW6qIBCQgku38wBuaCYL74PqxpqXt856TPSloZ4qIKehPsmsJ4OaS iV4MwkFIeXkNXvJnmRhfjXzb/d0DluVBbQbZMntNOxDPRiJVGKBMVSiqMvQlzLOED4kX TrgG26WnX35MoVC6FdMipkvYTZIojBKCnQUR2ng8ONuw5g+v/4iT7eiIaYrhf0MXITu4 zzeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RoSyf2cH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 c52si2971499eda.132.2019.10.17.22.09.16; Thu, 17 Oct 2019 22:09:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b=RoSyf2cH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2439398AbfJPWXE (ORCPT + 99 others); Wed, 16 Oct 2019 18:23:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:41658 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394810AbfJPVxE (ORCPT ); Wed, 16 Oct 2019 17:53:04 -0400 Received: from localhost (unknown [192.55.54.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2310621925; Wed, 16 Oct 2019 21:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262784; bh=h9SQcFept3pB+xkQBM+FRgICSsNP72okiwEZoRRoA3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RoSyf2cHOhskonkMEpQp0CBmYEbYJ93PRTFprwGFeRu2Z4cr1Lcd//s+4lSsDS5zY G5wHUuGNq6C+7xlDBDzaAgj9JefqvW+iTlb+2FbK+78YheTkh/OM1mHx9FZCSsTRv9 Kmhueb5L2wvdZh1NSyPHjgLL5XSIT9BxdeOqJHNE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jouni Malinen , Johannes Berg Subject: [PATCH 4.4 25/79] cfg80211: Use const more consistently in for_each_element macros Date: Wed, 16 Oct 2019 14:50:00 -0700 Message-Id: <20191016214753.108991885@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214729.758892904@linuxfoundation.org> References: <20191016214729.758892904@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jouni Malinen commit 7388afe09143210f555bdd6c75035e9acc1fab96 upstream. Enforce the first argument to be a correct type of a pointer to struct element and avoid unnecessary typecasts from const to non-const pointers (the change in validate_ie_attr() is needed to make this part work). In addition, avoid signed/unsigned comparison within for_each_element() and mark struct element packed just in case. Signed-off-by: Jouni Malinen Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- include/linux/ieee80211.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -2554,16 +2554,16 @@ struct element { u8 id; u8 datalen; u8 data[]; -}; +} __packed; /* element iteration helpers */ -#define for_each_element(element, _data, _datalen) \ - for (element = (void *)(_data); \ - (u8 *)(_data) + (_datalen) - (u8 *)element >= \ - sizeof(*element) && \ - (u8 *)(_data) + (_datalen) - (u8 *)element >= \ - sizeof(*element) + element->datalen; \ - element = (void *)(element->data + element->datalen)) +#define for_each_element(_elem, _data, _datalen) \ + for (_elem = (const struct element *)(_data); \ + (const u8 *)(_data) + (_datalen) - (const u8 *)_elem >= \ + (int)sizeof(*_elem) && \ + (const u8 *)(_data) + (_datalen) - (const u8 *)_elem >= \ + (int)sizeof(*_elem) + _elem->datalen; \ + _elem = (const struct element *)(_elem->data + _elem->datalen)) #define for_each_element_id(element, _id, data, datalen) \ for_each_element(element, data, datalen) \ @@ -2600,7 +2600,7 @@ struct element { static inline bool for_each_element_completed(const struct element *element, const void *data, size_t datalen) { - return (u8 *)element == (u8 *)data + datalen; + return (const u8 *)element == (const u8 *)data + datalen; } #endif /* LINUX_IEEE80211_H */