Skip to content
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

Jump to bottom

lz4: Cherrypick fix for CVE-2021-3520 #12947

Merged
merged 1 commit into from
Jan 13, 2022
Merged

lz4: Cherrypick fix for CVE-2021-3520 #12947

merged 1 commit into from
Jan 13, 2022

Conversation

rincebrain
Copy link
Contributor

Motivation and Context

I went to look seriously at integrating a compressor update, and what do I find but a bug requesting a new release due to fixing some sanitizer issues and a CVE.

Clearly the life lesson is to always sync code from git tip, not stable releases. /s

Description

I'd rather wait for a 1.9.4 and sync from that if the sanitizer issues mentioned cause anyone headaches (I'm sorry if your tree is now full of error messages #12928), but a size check to close a CVE seems like a reasonable change unlikely to break people.

How Has This Been Tested?

It built.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Performance enhancement (non-breaking change which improves efficiency)
  • Code cleanup (non-breaking change which makes code smaller or more readable)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Library ABI change (libzfs, libzfs_core, libnvpair, libuutil and libzfsbootenv)
  • Documentation (a change to man pages or other documentation)

Checklist:

@rincebrain
lz4: Cherrypick fix for CVE-2021-3520
1cddfef 
I don't think there's much risk of us accidentally hitting this,
since we'd need maliciously malformed data to wind up in the
pipeline, but still.

Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
@sempervictus sempervictus mentioned this pull request Jan 9, 2022
Open
@behlendorf behlendorf added the Status: Accepted Ready to integrate (reviewed, tested) label Jan 11, 2022
@behlendorf behlendorf merged commit 63f4bfd into openzfs:master Jan 13, 2022
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@rincebrain @nicman23
lz4: Cherrypick fix for CVE-2021-3520
573c095 
There should be no risk of us accidentally hitting this since
we'd need maliciously malformed data to wind up in the pipeline,
or a very unfortunate random bit flip at exactly the right moment.
Still since we can handle it we should.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Adam Moss <c@yotes.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#12947
nicman23 pushed a commit to nicman23/zfs that referenced this pull request Aug 22, 2022
@rincebrain @nicman23
lz4: Cherrypick fix for CVE-2021-3520
6022221 
There should be no risk of us accidentally hitting this since
we'd need maliciously malformed data to wind up in the pipeline,
or a very unfortunate random bit flip at exactly the right moment.
Still since we can handle it we should.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Adam Moss <c@yotes.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#12947
snajpa pushed a commit to vpsfreecz/zfs that referenced this pull request Oct 22, 2022
@rincebrain @snajpa
lz4: Cherrypick fix for CVE-2021-3520
ff1e6bb 
There should be no risk of us accidentally hitting this since
we'd need maliciously malformed data to wind up in the pipeline,
or a very unfortunate random bit flip at exactly the right moment.
Still since we can handle it we should.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Adam Moss <c@yotes.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#12947
snajpa pushed a commit to vpsfreecz/zfs that referenced this pull request Oct 22, 2022
@rincebrain @snajpa
lz4: Cherrypick fix for CVE-2021-3520
251d05c 
There should be no risk of us accidentally hitting this since
we'd need maliciously malformed data to wind up in the pipeline,
or a very unfortunate random bit flip at exactly the right moment.
Still since we can handle it we should.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Adam Moss <c@yotes.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#12947
snajpa pushed a commit to vpsfreecz/zfs that referenced this pull request Oct 23, 2022
@rincebrain @snajpa
lz4: Cherrypick fix for CVE-2021-3520
43eb754 
There should be no risk of us accidentally hitting this since
we'd need maliciously malformed data to wind up in the pipeline,
or a very unfortunate random bit flip at exactly the right moment.
Still since we can handle it we should.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Adam Moss <c@yotes.com>
Signed-off-by: Rich Ercolani <rincebrain@gmail.com>
Closes openzfs#12947
bsdjhb pushed a commit to CTSRD-CHERI/zfs that referenced this pull request Jul 13, 2023
@mmatuska @bsdjhb
lz4_zfs: FreeBSD-local changes to use a custom allocator.
f514117 
This is not associated with a specific upstream commit but apparently
a local diff applied as part of:

commit e92ffd9b626833ebdbf2742c8ffddc6cd94b963e
Merge: 3c3df3660072 17b2ae0
Author: Martin Matuska <mm@FreeBSD.org>
Date:   Sat Jan 22 23:05:15 2022 +0100

    zfs: merge openzfs/zfs@17b2ae0b2 (master) into main

    Notable upstream pull request merges:
      openzfs#12766 Fix error propagation from lzc_send_redacted
      openzfs#12805 Updated the lz4 decompressor
      openzfs#12851 FreeBSD: Provide correct file generation number
      openzfs#12857 Verify dRAID empty sectors
      openzfs#12874 FreeBSD: Update argument types for VOP_READDIR
      openzfs#12896 Reduce number of arc_prune threads
      openzfs#12934 FreeBSD: Fix zvol_*_open() locking
      openzfs#12947 lz4: Cherrypick fix for CVE-2021-3520
      openzfs#12961 FreeBSD: Fix leaked strings in libspl mnttab
      openzfs#12964 Fix handling of errors from dmu_write_uio_dbuf() on FreeBSD
      openzfs#12981 Introduce a flag to skip comparing the local mac when raw sending
      openzfs#12985 Avoid memory allocations in the ARC eviction thread

    Obtained from:  OpenZFS
    OpenZFS commit: 17b2ae0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@behlendorf behlendorf behlendorf approved these changes

@ikozhukhov ikozhukhov ikozhukhov approved these changes

@gmelikov gmelikov gmelikov approved these changes

@adamdmoss adamdmoss adamdmoss approved these changes

Assignees
No one assigned
Labels
Status: Accepted Ready to integrate (reviewed, tested)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rincebrain @behlendorf @ikozhukhov @gmelikov @adamdmoss