Skip to content

[AUTO-CHERRYPICK] Fix CVE-2024-53263 in git-lfs - branch main #12115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jslobodzian merged 1 commit into from
Jan 29, 2025
Merged

[AUTO-CHERRYPICK] Fix CVE-2024-53263 in git-lfs - branch main #12115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 55 additions & 0 deletions SPECS/git-lfs/CVE-2024-53263.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
From 52f3cb58093cdccffd87af9c97fd4ba61a0b848d Mon Sep 17 00:00:00 2001
From: Rohit Rawat <xordux@gmail.com>
Date: Mon, 27 Jan 2025 12:36:21 +0000
Subject: [PATCH] Fix CVE-2024-53263

Backported from https://github.com/git-lfs/git-lfs/commit/0345b6f816e611d050c0df67b61f0022916a1c90

---
creds/creds.go | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/creds/creds.go b/creds/creds.go
index 0cc6762..f4e1432 100644
--- a/creds/creds.go
+++ b/creds/creds.go
@@ -53,11 +53,14 @@ func (credWrapper *CredentialHelperWrapper) FillCreds() error {
// as input.
type Creds map[string][]string

-func bufferCreds(c Creds) *bytes.Buffer {
+func bufferCreds(c Creds) (*bytes.Buffer, error) {
buf := new(bytes.Buffer)

for k, v := range c {
for _, item := range v {
+ if strings.Contains(item, "\n") {
+ return nil, errors.Errorf(tr.Tr.Get("credential value for %s contains newline: %q", k, item))
+ }
buf.Write([]byte(k))
buf.Write([]byte("="))
buf.Write([]byte(item))
@@ -65,7 +68,7 @@ func bufferCreds(c Creds) *bytes.Buffer {
}
}

- return buf
+ return buf, nil
}

type CredentialHelperContext struct {
@@ -323,7 +326,10 @@ func (h *commandCredentialHelper) exec(subcommand string, input Creds) (Creds, e
if err != nil {
return nil, errors.New(tr.Tr.Get("failed to find `git credential %s`: %v", subcommand, err))
}
- cmd.Stdin = bufferCreds(input)
+ cmd.Stdin, err = bufferCreds(input)
+ if err != nil {
+ return nil, errors.New(tr.Tr.Get("invalid input to `git credential %s`: %v", subcommand, err))
+ }
cmd.Stdout = output
/*
There is a reason we don't read from stderr here:
--
2.40.4

6 changes: 5 additions & 1 deletion SPECS/git-lfs/git-lfs.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Summary: Git extension for versioning large files
Name: git-lfs
Version: 3.5.1
Release: 3%{?dist}
Release: 4%{?dist}
Group: System Environment/Programming
Vendor: Microsoft Corporation
Distribution: Mariner
Expand All @@ -29,6 +29,7 @@ Source0: https://github.com/git-lfs/git-lfs/archive/v%{version}.tar.gz#/%{
# - For the value of "--mtime" use the date "2021-04-26 00:00Z" to simplify future updates.
Source1: %{name}-%{version}-vendor.tar.gz
Patch0: CVE-2023-45288.patch
Patch1: CVE-2024-53263.patch

BuildRequires: golang
BuildRequires: which
Expand Down Expand Up @@ -79,6 +80,9 @@ git lfs uninstall
%{_mandir}/man5/*

%changelog
* Mon Jan 27 2025 Rohit Rawat <rohitrawat@microsoft.com> - 3.5.1-4
- Add patch for CVE-2024-53263

* Mon Sep 09 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.5.1-3
- Bump release to rebuild with go 1.22.7

Expand Down