Bug 2658 - Make integrity tests more robust against timeouts
Summary: Make integrity tests more robust against timeouts
Status: CLOSED FIXED
Alias: None
Product: Portable OpenSSH
Classification: Unclassified
Component: Regression tests (show other bugs)
Version: 7.4p1
Hardware: Other Linux
: P5 enhancement
Assignee: Assigned to nobody
URL:
Keywords:
Depends on:
Blocks: V_7_5 V_7_6
  Show dependency treegraph
 
Reported: 2017-01-02 02:28 AEDT by Colin Watson
Modified: 2021-04-23 15:08 AEST (History)
2 users (show)

See Also:


Attachments
Make integrity tests more robust against timeouts (1.75 KB, patch)
2017-01-02 02:28 AEDT, Colin Watson
djm: ok+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Colin Watson 2017-01-02 02:28:43 AEDT
Created attachment 2924 [details]
Make integrity tests more robust against timeouts

If the first test in a series for a given MAC happens to modify the low bytes of a packet length, then ssh will time out and this will be interpreted as a test failure.  I'm seeing this in practice on Ubuntu ppc64el (e.g. https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_77e2ada1e7a84929a74ba3b87153c0ac/autopkgtest-zesty/zesty/ppc64el/o/openssh/20161231_121729_ebc8a@/log.gz).

Fortunately there was already an XXX comment indicating what might be going wrong here, and although I haven't been able to reproduce it directly on a system where I can experiment interactively, I can at least reproduce it by fiddling with the start offset, which was enough to be able to put together a patch to make the tests more robust.  That patch is attached.
Comment 1 Darren Tucker 2017-01-06 13:26:50 AEDT
Applied, thanks.
Comment 2 Colin Watson 2017-03-29 20:00:19 AEDT
Only part of this patch was actually applied (compare https://bugzilla.mindrot.org/attachment.cgi?id=2924&action=diff with https://anongit.mindrot.org/openssh.git/commit/?id=e5c7ec67cdc42ae2584085e0fc5cc5ee91133cf5).  Could you please check again?
Comment 3 Darren Tucker 2017-03-29 20:44:30 AEDT
will take a look
Comment 4 Damien Miller 2017-04-28 13:12:51 AEST
Comment on attachment 2924 [details]
Make integrity tests more robust against timeouts

Looks ok to me
Comment 5 Darren Tucker 2017-04-28 14:35:37 AEST
Sorry about that; there were unnoticed rejects due to differences between -portable and upstream.  I've resynced and applied the missing part of the patch, it should all be there now:

https://anongit.mindrot.org/openssh.git/commit/?id=9504ea6b27f9f0ece64e88582ebb9235e664a100

Thanks.
Comment 6 Damien Miller 2021-04-23 15:08:47 AEST
closing resolved bugs as of 8.6p1 release