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

lldp defect miscellaneous fixes as patches #6118

Merged
merged 1 commit into from
Jan 5, 2021

Conversation

sudhanshukumar22
Copy link
Contributor

@sudhanshukumar22 sudhanshukumar22 commented Dec 3, 2020

The details are as follows:

1. 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
Ported fix lldpd/lldpd#408 from LLDP community.
lib: remove limit on system description length

The limit was introduced in 9c49ced while fixing a memory leak.
The state data is used to ensure we don't interleave operations. We
need to handle the case where the value is truncated because it is
larger than the allocated size.

Fix #408.
2. 0011-fix-med-location-len.patch
Ported fix lldpd/lldpd#422 from community.
lib: fix LLDP-MED location parsing in liblldpctl

Some bounds were not checked correctly when parsing LLDP-MED civic
location fields. This triggers out-of-bound reads (no write) in
lldpcli, ultimately leading to a crash.

Fix #420

Signed-off-by: sudhanshukumar22 sudhanshu.kumar@broadcom.com

- Why I did it

- How I did it

- How to verify it

- Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@lguohan
Copy link
Collaborator

lguohan commented Dec 21, 2020

i can see patch 420 is closed and 422 is used. have you adapt this pr to the upstream patch?

what i like to see is that you adapt this pr to original commit 422 and update the pr description to reflect that.

also please generate your patch properly using git format-patch commit from upstream repo. the patch is not formatted properly.

Copy link
Collaborator

@lguohan lguohan left a comment

Choose a reason for hiding this comment

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

as comments.

@sudhanshukumar22 sudhanshukumar22 force-pushed the lldp_patch_branch branch 2 times, most recently from 8290247 to 7315bbd Compare December 21, 2020 15:52
@sudhanshukumar22
Copy link
Contributor Author

as comments.

@lguohan : Please review the changes. I have updated as per your review comments.

@lguohan
Copy link
Collaborator

lguohan commented Dec 23, 2020

can you check the build failure?

00:37:38  error: patch failed: NEWS:1
00:37:38  error: NEWS: patch does not apply
00:37:38  error: tests/integration/test_pcap.py: does not exist in index

@sudhanshukumar22 sudhanshukumar22 force-pushed the lldp_patch_branch branch 2 times, most recently from 02be88d to 6bddc66 Compare December 24, 2020 17:50
    The details are as follows:
    1. 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch
    Ported fix lldpd/lldpd#408 from LLDP community.
    lib: remove limit on system description length

    The limit was introduced in 9c49ced while fixing a memory leak.
    The state data is used to ensure we don't interleave operations. We
    need to handle the case where the value is truncated because it is
    larger than the allocated size.

    Fix sonic-net#408.
    2. 0011-fix-med-location-len.patch
    Ported fix lldpd/lldpd#422 from community.
    lib: fix LLDP-MED location parsing in liblldpctl

    Some bounds were not checked correctly when parsing LLDP-MED civic
    location fields. This triggers out-of-bound reads (no write) in
    lldpcli, ultimately leading to a crash.

    Fix sonic-net#420
Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
@lguohan lguohan merged commit 7fc2d38 into sonic-net:master Jan 5, 2021
lguohan pushed a commit that referenced this pull request Jan 5, 2021
The details are as follows:

    1. 0010-Ported-fix-for-length-exceeded-from-lldp-community.patch

    Patch taken from lldpd/lldpd@7824347

    lib: remove limit on system description length

    The limit was introduced in 9c49ced while fixing a memory leak.
    The state data is used to ensure we don't interleave operations. We
    need to handle the case where the value is truncated because it is
    larger than the allocated size.

    Fix issue lldpd/lldpd#408

    2. 0011-fix-med-location-len.patch
    
    Patch taken from lldpd/lldpd@5c34794

    lib: fix LLDP-MED location parsing in liblldpctl

    Some bounds were not checked correctly when parsing LLDP-MED civic
    location fields. This triggers out-of-bound reads (no write) in
    lldpcli, ultimately leading to a crash.

    Fix lldpd/lldpd#420

Signed-off-by: sudhanshukumar22 <sudhanshu.kumar@broadcom.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants