Skip to content

Comments

crypto/bio/bss_acpt: guard addr_iter in BIO_C_GET_ACCEPT and clear on…#28915

Closed
MegaManSec wants to merge 2 commits intoopenssl:masterfrom
MegaManSec:no_pr_3
Closed

crypto/bio/bss_acpt: guard addr_iter in BIO_C_GET_ACCEPT and clear on…#28915
MegaManSec wants to merge 2 commits intoopenssl:masterfrom
MegaManSec:no_pr_3

Conversation

@MegaManSec
Copy link
Contributor

@MegaManSec MegaManSec commented Oct 15, 2025

… reset

BIO_C_GET_ACCEPT (num == 4) queried BIO_ADDRINFO_family(data->addr_iter) without checking for NULL. addr_iter can be NULL before any lookup or stale after BIO_CTRL_RESET (addr_first freed). Return accept_family when addr_iter is NULL, and clear addr_iter in BIO_CTRL_RESET to avoid a dangling pointer.

Sashan
Sashan requested changes Oct 16, 2025
View reviewed changes
@Sashan Sashan added branch: master Applies to master branch approval: review pending This pull request needs review by a committer triaged: bug The issue/pr is/fixes a bug branch: 3.0 Applies to openssl-3.0 branch branch: 3.2 Applies to openssl-3.2 (EOL) branch: 3.3 Applies to openssl-3.3 branch: 3.4 Applies to openssl-3.4 branch: 3.5 Applies to openssl-3.5 branch: 3.6 Applies to openssl-3.6 labels Oct 16, 2025
Sashan
Sashan previously approved these changes Oct 17, 2025
View reviewed changes
Copy link
Contributor

@Sashan Sashan left a comment

Choose a reason for hiding this comment

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

looks good to me. thanks.

@openssl-machine
Copy link
Collaborator

openssl-machine commented Nov 17, 2025

This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago

@t8m t8m removed the branch: 3.2 Applies to openssl-3.2 (EOL) label Nov 25, 2025
@openssl-machine
Copy link
Collaborator

openssl-machine commented Dec 26, 2025

This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago

fwh-dc
fwh-dc previously approved these changes Jan 10, 2026
View reviewed changes
Copy link
Contributor

@fwh-dc fwh-dc left a comment

Choose a reason for hiding this comment

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

Sorry for the wait!
LGTM. There is a similar issue in bss_conn.c, if you feel like fixing that as well it would be much appreciated.

@fwh-dc fwh-dc added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jan 10, 2026
@MegaManSec MegaManSec dismissed stale reviews from fwh-dc and Sashan via 95b0617 January 10, 2026 08:56
@MegaManSec
Copy link
Contributor Author

MegaManSec commented Jan 10, 2026

sure, should be good now. i cleaned up the intermediate commit.

@MegaManSec MegaManSec force-pushed the no_pr_3 branch 2 times, most recently from c625c5a to 1090122 Compare January 10, 2026 09:03
@loci-dev loci-dev mentioned this pull request Jan 10, 2026
Open
@openssl-machine
Copy link
Collaborator

openssl-machine commented Jan 11, 2026

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

fwh-dc
fwh-dc approved these changes Jan 12, 2026
View reviewed changes
Copy link
Contributor

@fwh-dc fwh-dc left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM. @Sashan please re-approve.

@fwh-dc fwh-dc requested a review from Sashan January 12, 2026 08:30
@t8m t8m added tests: exempted The PR is exempt from requirements for testing approval: done This pull request has the required number of approvals and removed approval: done This pull request has the required number of approvals labels Jan 12, 2026
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Jan 13, 2026
@openssl-machine
Copy link
Collaborator

openssl-machine commented Jan 13, 2026

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
f5d5b83 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit eb84d81)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
e5d1e56 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit c64912c)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
de0749b 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit eb84d81)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
dfe0fd0 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit c64912c)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
eb84d81 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
c64912c 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
d2f8d9c 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit eb84d81)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
bcbb240 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit c64912c)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
4fd09f2 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit eb84d81)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
827f7fd 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit c64912c)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_acpt
9b55b1d 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit eb84d81)
openssl-machine pushed a commit that referenced this pull request Jan 19, 2026
@MegaManSec @mattcaswell
Clear addr_iter on reset in bss_conn
20d5d92 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #28915)

(cherry picked from commit c64912c)
@mattcaswell
Copy link
Member

mattcaswell commented Jan 19, 2026

Merged to master, 3.6, 3.5, 3.4, 3.3 and 3.0. Thank you for your contribution.

esyr pushed a commit to esyr/openssl that referenced this pull request Jan 19, 2026
@MegaManSec @esyr
Clear addr_iter on reset in bss_acpt
efe4544 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#28915)
esyr pushed a commit to esyr/openssl that referenced this pull request Jan 19, 2026
@MegaManSec @esyr
Clear addr_iter on reset in bss_conn
0be12f3 
Signed-off-by: Joshua Rogers <[email protected]>

Reviewed-by: Frederik Wedel-Heinen <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#28915)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@t8m t8m t8m approved these changes

@fwh-dc fwh-dc fwh-dc approved these changes

@Sashan Sashan Awaiting requested review from Sashan

Assignees

No one assigned

Labels

approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Applies to master branch branch: 3.0 Applies to openssl-3.0 branch branch: 3.3 Applies to openssl-3.3 branch: 3.4 Applies to openssl-3.4 branch: 3.5 Applies to openssl-3.5 branch: 3.6 Applies to openssl-3.6 tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@MegaManSec @openssl-machine @mattcaswell @Sashan @t8m @fwh-dc