diff options
| author | Kees Cook <keescook@chromium.org> | 2021-11-18 12:37:12 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-12-13 16:31:24 -0700 |
| commit | 52a0cab35c568f896067641d8e07f798341954f5 (patch) | |
| tree | 9b06ef874eaf498509e2da844c682385743f54b0 /drivers/block/drbd/drbd_protocol.h | |
| parent | 322c4293ecc58110227b49d7e47ae37b9b03566f (diff) | |
drbd: Use struct_group() to zero algs
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>
Link: https://lore.kernel.org/r/20211118203712.1288866-1-keescook@chromium.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd/drbd_protocol.h')
| -rw-r--r-- | drivers/block/drbd/drbd_protocol.h | 6 |
1 files changed, 4 insertions, 2 deletions
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; |