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

server: fix SIGSEGV caused by port probing with audit plugin (#16038) #16065

Merged
merged 1 commit into from
Apr 7, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 3, 2020

cherry-pick #16038 to release-3.1


What problem does this PR solve?

Issue Number: close #16037

Problem Summary:

port probing will establish tcp connection, then exit without send any auth packet, so conn's session ctx should be nil and this cause crash in audit plugin code path.

What is changed and how it works?

What's Changed:

ensure session ctx is not nil before do reject audit.

How it Works:

check nil

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Manual test
start tidb with audit plugin, and telnet 0.0.0.0 4000 then control-c to exit telent

and watch tidb-stderr.log

Side effects

  • n/a

Release note


This change is Reviewable

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 3, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 5, 2020

@jackysp, @imtbkcat, PTAL.

@imtbkcat
Copy link

imtbkcat commented Apr 7, 2020

@lysu please fix conflict

@lysu
Copy link
Contributor

lysu commented Apr 7, 2020

@imtbkcat @jackysp hi need merge #15799 first, thx

@lysu lysu force-pushed the release-3.1-6d02bc72d9c0 branch from 5e7e12d to 036fb24 Compare April 7, 2020 05:54
@lysu
Copy link
Contributor

lysu commented Apr 7, 2020

/run-all-tests

Copy link
Member

@jackysp jackysp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

@imtbkcat imtbkcat left a comment

Choose a reason for hiding this comment

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

LGTM

@jackysp
Copy link
Member

jackysp commented Apr 7, 2020

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 7, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 7, 2020

/run-all-tests

@sre-bot sre-bot merged commit f2ebfa2 into pingcap:release-3.1 Apr 7, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/plugin component/server contribution This PR is from a community contributor. status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug. type/3.1-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants