From: "Gustavo A. R. Silva" <gustavoars@kernel.org>
To: Kees Cook <keescook@chromium.org>
Cc: Philipp Reisner <philipp.reisner@linbit.com>,
Lars Ellenberg <lars.ellenberg@linbit.com>,
Jens Axboe <axboe@kernel.dk>,
linux-kernel@vger.kernel.org, drbd-dev@lists.linbit.com,
linux-block@vger.kernel.org, linux-hardening@vger.kernel.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>
Subject: Re: [PATCH] drbd: Use struct_group() to zero algs
Date: Mon, 13 Dec 2021 17:28:28 -0600 [thread overview]
Message-ID: <20211213232828.GC60133@embeddedor> (raw)
In-Reply-To: <20211118203712.1288866-1-keescook@chromium.org>
On Thu, Nov 18, 2021 at 12:37:12PM -0800, Kees Cook wrote:
> In preparation for FORTIFY_SOURCE performing compile-time and run-time
> field bounds checking for memset(), avoid intentionally writing across
> neighboring fields.
>
> Add a struct_group() for the algs so that memset() can correctly reason
> about the size.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/block/drbd/drbd_main.c | 3 ++-
> drivers/block/drbd/drbd_protocol.h | 6 ++++--
> drivers/block/drbd/drbd_receiver.c | 3 ++-
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 53ba2dddba6e..feac72e323bd 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -729,7 +729,8 @@ int drbd_send_sync_param(struct drbd_peer_device *peer_device)
> cmd = apv >= 89 ? P_SYNC_PARAM89 : P_SYNC_PARAM;
>
> /* initialize verify_alg and csums_alg */
> - memset(p->verify_alg, 0, 2 * SHARED_SECRET_MAX);
> + BUILD_BUG_ON(sizeof(p->algs) != 2 * SHARED_SECRET_MAX);
> + memset(&p->algs, 0, sizeof(p->algs));
>
> if (get_ldev(peer_device->device)) {
> dc = rcu_dereference(peer_device->device->ldev->disk_conf);
> diff --git a/drivers/block/drbd/drbd_protocol.h b/drivers/block/drbd/drbd_protocol.h
> index dea59c92ecc1..a882b65ab5d2 100644
> --- a/drivers/block/drbd/drbd_protocol.h
> +++ b/drivers/block/drbd/drbd_protocol.h
> @@ -283,8 +283,10 @@ struct p_rs_param_89 {
>
> struct p_rs_param_95 {
> u32 resync_rate;
> - char verify_alg[SHARED_SECRET_MAX];
> - char csums_alg[SHARED_SECRET_MAX];
> + struct_group(algs,
> + char verify_alg[SHARED_SECRET_MAX];
> + char csums_alg[SHARED_SECRET_MAX];
> + );
> u32 c_plan_ahead;
> u32 c_delay_target;
> u32 c_fill_target;
> diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
> index 1f740e42e457..6df2539e215b 100644
> --- a/drivers/block/drbd/drbd_receiver.c
> +++ b/drivers/block/drbd/drbd_receiver.c
> @@ -3921,7 +3921,8 @@ static int receive_SyncParam(struct drbd_connection *connection, struct packet_i
>
> /* initialize verify_alg and csums_alg */
> p = pi->data;
> - memset(p->verify_alg, 0, 2 * SHARED_SECRET_MAX);
> + BUILD_BUG_ON(sizeof(p->algs) != 2 * SHARED_SECRET_MAX);
> + memset(&p->algs, 0, sizeof(p->algs));
>
> err = drbd_recv_all(peer_device->connection, p, header_size);
> if (err)
> --
> 2.30.2
>
>
>
>
next prev parent reply other threads:[~2021-12-13 23:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 20:37 [PATCH] drbd: Use struct_group() to zero algs Kees Cook
2021-12-13 23:28 ` Gustavo A. R. Silva [this message]
2021-12-13 23:31 ` Jens Axboe
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=20211213232828.GC60133@embeddedor \
--to=gustavoars@kernel.org \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=keescook@chromium.org \
--cc=lars.ellenberg@linbit.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=philipp.reisner@linbit.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