Git Mailing List Archive mirror
 help / color / mirror / Atom feed
From: Patrick Steinhardt <>
To: Taylor Blau <>
Cc:, Jeff King <>,
	Junio C Hamano <>
Subject: Re: [PATCH] attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf()
Date: Mon, 6 May 2024 07:57:20 +0200	[thread overview]
Message-ID: <ZjhxQOgRgvv7_gGY@tanuki> (raw)
In-Reply-To: <>

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

On Fri, May 03, 2024 at 03:12:36PM -0400, Taylor Blau wrote:
> Commit 3c50032ff52 (attr: ignore overly large gitattributes files,
> 2022-12-01) added a defense-in-depth check to ensure that .gitattributes
> blobs read from the index do not exceed ATTR_MAX_FILE_SIZE (100 MB).
> But there were two cases added shortly after 3c50032ff52 was written
> which do not apply similar protections:
>   - 47cfc9bd7d0 (attr: add flag `--source` to work with tree-ish,
>     2023-01-14)
>   - 4723ae1007f (attr.c: read attributes in a sparse directory,
>     2023-08-11) added a similar
> Ensure that we refuse to process a .gitattributes blob exceeding
> ATTR_MAX_FILE_SIZE when reading from either an arbitrary tree object or
> a sparse directory. This is done by pushing the ATTR_MAX_FILE_SIZE check
> down into the low-level `read_attr_from_buf()`.
> In doing so, plug a leak in `read_attr_from_index()` where we would
> accidentally leak the large buffer upon detecting it is too large to
> process.
> (Since `read_attr_from_buf()` handles a NULL buffer input, we can remove
> a NULL check before calling it in `read_attr_from_index()` as well).
> Co-authored-by: Jeff King <>
> Signed-off-by: Jeff King <>
> Signed-off-by: Taylor Blau <>
> ---

This patch looks good to me, thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

      parent reply	other threads:[~2024-05-06  5:57 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-03 19:12 [PATCH] attr.c: move ATTR_MAX_FILE_SIZE check into read_attr_from_buf() Taylor Blau
2024-05-03 19:45 ` Junio C Hamano
2024-05-06  5:57 ` Patrick Steinhardt [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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=ZjhxQOgRgvv7_gGY@tanuki \ \ \ \ \ \

* 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).