* [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr
@ 2021-12-07 21:20 Kees Cook
2021-12-08 8:51 ` Leon Romanovsky
2021-12-14 0:39 ` Gustavo A. R. Silva
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2021-12-07 21:20 UTC (permalink / raw)
To: Leon Romanovsky
Cc: Kees Cook, Doug Ledford, Jason Gunthorpe, linux-kernel,
linux-rdma, linux-hardening
In preparation for FORTIFY_SOURCE performing compile-time and run-time
field bounds checking for memset(), avoid intentionally writing across
neighboring fields.
Use memset_after() to zero the end of struct mlx5_ib_mr that should
be initialized.
Signed-off-by: Kees Cook <keescook@chromium.org>
---
v2: rebased, umem moved into the union and is expected to be wiped
https://lore.kernel.org/lkml/20211207194525.GL6385@nvidia.com
---
drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
index 4a7a56ed740b..ded10719b643 100644
--- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
+++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
@@ -664,8 +664,8 @@ struct mlx5_ib_mr {
/* User MR data */
struct mlx5_cache_ent *cache_ent;
+ /* Everything after cache_ent is zero'd when MR allocated */
- /* This is zero'd when the MR is allocated */
union {
/* Used only while the MR is in the cache */
struct {
@@ -718,7 +718,7 @@ struct mlx5_ib_mr {
/* Zero the fields in the mr that are variant depending on usage */
static inline void mlx5_clear_mr(struct mlx5_ib_mr *mr)
{
- memset(mr->out, 0, sizeof(*mr) - offsetof(struct mlx5_ib_mr, out));
+ memset_after(mr, 0, cache_ent);
}
static inline bool is_odp_mr(struct mlx5_ib_mr *mr)
--
2.30.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr
2021-12-07 21:20 [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr Kees Cook
@ 2021-12-08 8:51 ` Leon Romanovsky
2021-12-14 0:39 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Leon Romanovsky @ 2021-12-08 8:51 UTC (permalink / raw)
To: Kees Cook
Cc: Doug Ledford, Jason Gunthorpe, linux-kernel, linux-rdma, linux-hardening
On Tue, Dec 07, 2021 at 01:20:22PM -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.
>
> Use memset_after() to zero the end of struct mlx5_ib_mr that should
> be initialized.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
> v2: rebased, umem moved into the union and is expected to be wiped
> https://lore.kernel.org/lkml/20211207194525.GL6385@nvidia.com
> ---
> drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
Thanks,
Acked-by: Leon Romanovsky <leonro@nvidia.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr
2021-12-07 21:20 [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr Kees Cook
2021-12-08 8:51 ` Leon Romanovsky
@ 2021-12-14 0:39 ` Gustavo A. R. Silva
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2021-12-14 0:39 UTC (permalink / raw)
To: Kees Cook
Cc: Leon Romanovsky, Doug Ledford, Jason Gunthorpe, linux-kernel,
linux-rdma, linux-hardening, Gustavo A. R. Silva
On Tue, Dec 07, 2021 at 01:20:22PM -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.
>
> Use memset_after() to zero the end of struct mlx5_ib_mr that should
> be initialized.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> v2: rebased, umem moved into the union and is expected to be wiped
> https://lore.kernel.org/lkml/20211207194525.GL6385@nvidia.com
> ---
> drivers/infiniband/hw/mlx5/mlx5_ib.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> index 4a7a56ed740b..ded10719b643 100644
> --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h
> +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h
> @@ -664,8 +664,8 @@ struct mlx5_ib_mr {
>
> /* User MR data */
> struct mlx5_cache_ent *cache_ent;
> + /* Everything after cache_ent is zero'd when MR allocated */
>
> - /* This is zero'd when the MR is allocated */
> union {
> /* Used only while the MR is in the cache */
> struct {
> @@ -718,7 +718,7 @@ struct mlx5_ib_mr {
> /* Zero the fields in the mr that are variant depending on usage */
> static inline void mlx5_clear_mr(struct mlx5_ib_mr *mr)
> {
> - memset(mr->out, 0, sizeof(*mr) - offsetof(struct mlx5_ib_mr, out));
> + memset_after(mr, 0, cache_ent);
> }
>
> static inline bool is_odp_mr(struct mlx5_ib_mr *mr)
> --
> 2.30.2
>
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-14 0:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-07 21:20 [PATCH v2] RDMA/mlx5: Use memset_after() to zero struct mlx5_ib_mr Kees Cook
2021-12-08 8:51 ` Leon Romanovsky
2021-12-14 0:39 ` Gustavo A. R. Silva
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).