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.

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

Fix LZ4_uncompress_unknownOutputSize caused panic #5975

Merged
merged 1 commit into from
May 19, 2017

Conversation

loyou
Copy link
Contributor

@loyou loyou commented Apr 6, 2017

Fix LZ4_uncompress_unknownOutputSize caused panic

Sync with kernel patches for lz4:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/log/lib/lz4

including:
4a3a99 lz4: add overrun checks to lz4_uncompress_unknownoutputsize()
d5e7ca LZ4 : fix the data abort issue
bea2b5 lib/lz4: Pull out constant tables
99b7e9 lz4: fix system halt at boot kernel on x86_64

Signed-off-by: Feng Sun [email protected]

Description

Sync with kernel lz4 lib patch.

Motivation and Context

#5973

How Has This Been Tested?

set compression with lz4 and run basic file operations.

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)

Checklist:

  • My code follows the ZFS on Linux code style requirements.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.
  • All commit messages are properly formatted and contain Signed-off-by.
  • Change has been approved by a ZFS on Linux member.

@gmelikov
Copy link
Member

gmelikov commented Apr 7, 2017

@loyou if you want to rebase, you need:

git remote add zfsonlinux https://github.com/zfsonlinux/zfs.git
git fetch -all
git rebase zfsonlinux/master

and git push -f after that.

@loyou
Copy link
Contributor Author

loyou commented Apr 7, 2017

yes, thanks @gmelikov , there are conflicts because of latest lz4.c spelling check patch.
I have forced push for clear code.

Sync with kernel patches for lz4:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/
linux-stable.git/log/lib/lz4

including:
4a3a99 lz4: add overrun checks to lz4_uncompress_unknownoutputsize()
d5e7ca LZ4 : fix the data abort issue
bea2b5 lib/lz4: Pull out constant tables
99b7e9 lz4: fix system halt at boot kernel on x86_64

Signed-off-by: Feng Sun <[email protected]>
@tuxoko
Copy link
Contributor

tuxoko commented Apr 14, 2017

While this change looks fine with me, the next linux release will include a much newer version of lz4. I wonder if we want to move to the same version so we can track the one in kernel easier.

@kernelOfTruth
Copy link
Contributor

Referencing:

https://lkml.org/lkml/2017/2/5/139 [PATCH v7 0/5] Update LZ4 compressor module
https://lwn.net/Articles/714619/ Update LZ4 compressor module

Copy link
Contributor

@tuxoko tuxoko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, let's merge this first and deal with upgrading newer lz4 later.

Copy link
Contributor

@behlendorf behlendorf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Sorry about the delay, will merge.

@behlendorf behlendorf merged commit f871ab6 into openzfs:master May 19, 2017
@loyou loyou deleted the zfs-issue-5973 branch May 20, 2017 08:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants