From: Kees Cook <keescook@chromium.org>
To: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: Jouni Malinen <j@w1.fi>, Kalle Valo <kvalo@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
netdev@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Subject: Re: [PATCH 4/6][next] hostap: Avoid clashing function prototypes
Date: Mon, 17 Oct 2022 19:48:17 -0700 [thread overview]
Message-ID: <202210171944.27607BC@keescook> (raw)
In-Reply-To: <099d191c65efdf2f5f7b40a87a7eb3aabcae3e04.1666038048.git.gustavoars@kernel.org>
On Mon, Oct 17, 2022 at 03:35:33PM -0500, Gustavo A. R. Silva wrote:
> [...]
> @@ -2885,7 +2915,7 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
> struct hostap_interface *iface;
> local_info_t *local;
> int ret = 0;
> - u32 mode;
> + union iwreq_data wrqu;
>
> iface = netdev_priv(dev);
> local = iface->local;
> @@ -2899,8 +2929,8 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
> if (*i == 0) {
> /* Disable monitor mode - old mode was not saved, so go to
> * Master mode */
> - mode = IW_MODE_MASTER;
> - ret = prism2_ioctl_siwmode(dev, NULL, &mode, NULL);
> + wrqu.mode = IW_MODE_MASTER;
> + ret = prism2_ioctl_siwmode(dev, NULL, &wrqu, NULL);
> } else if (*i == 1) {
> /* netlink socket mode is not supported anymore since it did
> * not separate different devices from each other and was not
> @@ -2916,8 +2946,8 @@ static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
> local->monitor_type = PRISM2_MONITOR_PRISM;
> break;
> }
> - mode = IW_MODE_MONITOR;
> - ret = prism2_ioctl_siwmode(dev, NULL, &mode, NULL);
> + wrqu.mode = IW_MODE_MONITOR;
> + ret = prism2_ioctl_siwmode(dev, NULL, &wrqu, NULL);
> hostap_monitor_mode_enable(local);
> } else
> ret = -EINVAL;
Ah, nice! Casts in the callers! :)
> [...]
> -static const iw_handler prism2_private_handler[] =
> -{ /* SIOCIWFIRSTPRIV + */
> - (iw_handler) prism2_ioctl_priv_prism2_param, /* 0 */
> - (iw_handler) prism2_ioctl_priv_get_prism2_param, /* 1 */
> - (iw_handler) prism2_ioctl_priv_writemif, /* 2 */
> - (iw_handler) prism2_ioctl_priv_readmif, /* 3 */
> +static const iw_handler prism2_private_handler[] = {
> + IW_HANDLER(SIOCIWFIRSTPRIV + 0, prism2_ioctl_priv_prism2_param),
> + IW_HANDLER(SIOCIWFIRSTPRIV + 1, prism2_ioctl_priv_get_prism2_param),
> + IW_HANDLER(SIOCIWFIRSTPRIV + 2, prism2_ioctl_priv_writemif),
> + IW_HANDLER(SIOCIWFIRSTPRIV + 3, prism2_ioctl_priv_readmif),
> };
These should stay as they were. Check the size of the data segment. :)
(It'd be nice if IW_HANDLER() actually checked for >=SIOCIWFIRSTPRIV,
and dropped it back to zero-index, but there's only a handful of
these...)
I think we're so used to examining only the .text segment we didn't
double-check the arrays we touched in the .data segment.
--
Kees Cook
next prev parent reply other threads:[~2022-10-18 2:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-17 20:32 [PATCH 0/6][next] Avoid clashing function prototypes Gustavo A. R. Silva
2022-10-17 20:33 ` [PATCH 1/6][next] orinoco: " Gustavo A. R. Silva
2022-10-18 2:26 ` Kees Cook
2022-10-17 20:34 ` [PATCH 2/6][next] cfg80211: " Gustavo A. R. Silva
2022-10-18 2:41 ` Kees Cook
2022-10-18 19:31 ` Gustavo A. R. Silva
2022-10-17 20:34 ` [PATCH 3/6][next] ipw2x00: Remove unnecessary cast to iw_handler in ipw_wx_handlers Gustavo A. R. Silva
2022-10-18 2:43 ` Kees Cook
2022-10-17 20:35 ` [PATCH 4/6][next] hostap: Avoid clashing function prototypes Gustavo A. R. Silva
2022-10-18 2:48 ` Kees Cook [this message]
2022-10-17 20:35 ` [PATCH 5/6][next] zd1201: " Gustavo A. R. Silva
2022-10-18 2:49 ` Kees Cook
2022-10-17 20:36 ` [PATCH 6/6][next] airo: " Gustavo A. R. Silva
2022-10-18 2:53 ` Kees Cook
2022-10-19 5:58 ` Gustavo A. R. Silva
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202210171944.27607BC@keescook \
--to=keescook@chromium.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gustavoars@kernel.org \
--cc=j@w1.fi \
--cc=kuba@kernel.org \
--cc=kvalo@kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).