From: Danilo Krummrich <dakr@redhat.com>
To: Kees Cook <keescook@chromium.org>
Cc: Lyude Paul <lyude@redhat.com>, David Airlie <airlied@gmail.com>,
Daniel Vetter <daniel@ffwll.ch>, Dave Airlie <airlied@redhat.com>,
Ben Skeggs <bskeggs@redhat.com>, Timur Tabi <ttabi@nvidia.com>,
dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Dan Carpenter <dan.carpenter@linaro.org>,
linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org,
Karol Herbst <kherbst@redhat.com>
Subject: Re: [PATCH] nouveau/gsp: Avoid addressing beyond end of rpc->entries
Date: Fri, 5 Apr 2024 18:37:26 +0200 [thread overview]
Message-ID: <593a8479-741a-44de-a52c-8d34810bfb3e@redhat.com> (raw)
In-Reply-To: <20240330141159.work.063-kees@kernel.org>
On 3/30/24 15:12, Kees Cook wrote:
> Using the end of rpc->entries[] for addressing runs into both compile-time
> and run-time detection of accessing beyond the end of the array. Use the
> base pointer instead, since was allocated with the additional bytes for
> storing the strings. Avoids the following warning in future GCC releases
> with support for __counted_by:
>
> In function 'fortify_memcpy_chk',
> inlined from 'r535_gsp_rpc_set_registry' at ../drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c:1123:3:
> ../include/linux/fortify-string.h:553:25: error: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Werror=attribute-warning]
> 553 | __write_overflow_field(p_size_field, size);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> for this code:
>
> strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES];
> ...
> memcpy(strings, r535_registry_entries[i].name, name_len);
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
Applied to drm-misc-fixes, thanks!
> ---
> Cc: Karol Herbst <kherbst@redhat.com>
> Cc: Lyude Paul <lyude@redhat.com>
> Cc: Danilo Krummrich <dakr@redhat.com>
> Cc: David Airlie <airlied@gmail.com>
> Cc: Daniel Vetter <daniel@ffwll.ch>
> Cc: Dave Airlie <airlied@redhat.com>
> Cc: Ben Skeggs <bskeggs@redhat.com>
> Cc: Timur Tabi <ttabi@nvidia.com>
> Cc: dri-devel@lists.freedesktop.org
> Cc: nouveau@lists.freedesktop.org
> ---
> drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> index 9994cbd6f1c4..9858c1438aa7 100644
> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c
> @@ -1112,7 +1112,7 @@ r535_gsp_rpc_set_registry(struct nvkm_gsp *gsp)
> rpc->numEntries = NV_GSP_REG_NUM_ENTRIES;
>
> str_offset = offsetof(typeof(*rpc), entries[NV_GSP_REG_NUM_ENTRIES]);
> - strings = (char *)&rpc->entries[NV_GSP_REG_NUM_ENTRIES];
> + strings = (char *)rpc + str_offset;
> for (i = 0; i < NV_GSP_REG_NUM_ENTRIES; i++) {
> int name_len = strlen(r535_registry_entries[i].name) + 1;
>
prev parent reply other threads:[~2024-04-05 16:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-30 14:12 [PATCH] nouveau/gsp: Avoid addressing beyond end of rpc->entries Kees Cook
2024-04-05 16:37 ` Danilo Krummrich [this message]
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=593a8479-741a-44de-a52c-8d34810bfb3e@redhat.com \
--to=dakr@redhat.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=bskeggs@redhat.com \
--cc=dan.carpenter@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gustavoars@kernel.org \
--cc=keescook@chromium.org \
--cc=kherbst@redhat.com \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=nouveau@lists.freedesktop.org \
--cc=ttabi@nvidia.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 read-only IMAP folder(s) and NNTP newsgroup(s).