Merge ~bryce/ubuntu/+source/dovecot:ubuntu/focal-devel into ubuntu/+source/dovecot:ubuntu/devel

Proposed by Bryce Harrington
Status: Approved
Approved by: Bryce Harrington
Approved revision: e95080643b1f66b2b536bb55c80f54bca845727a
Proposed branch: ~bryce/ubuntu/+source/dovecot:ubuntu/focal-devel
Merge into: ubuntu/+source/dovecot:ubuntu/devel
Diff against target: 6703 lines (+6249/-0) (has conflicts)
43 files modified
debian/changelog (+985/-0)
debian/control (+12/-0)
debian/patches/CVE-2020-109xx/0001-lib-smtp-smtp-server-cmd-vrfy-Restructure-parameter-.patch (+40/-0)
debian/patches/CVE-2020-109xx/0002-lib-smtp-smtp-syntax-Do-not-allow-NULL-return-parame.patch (+63/-0)
debian/patches/CVE-2020-109xx/0003-lib-smtp-smtp-syntax-Do-not-allow-NULL-return-parame.patch (+54/-0)
debian/patches/CVE-2020-109xx/0004-lib-smtp-smtp-syntax-Do-not-allow-NULL-return-parame.patch (+99/-0)
debian/patches/CVE-2020-109xx/0005-lib-smtp-smtp-syntax-Return-0-for-smtp_string_parse-.patch (+27/-0)
debian/patches/CVE-2020-109xx/0006-lib-smtp-Add-tests-for-smtp_string_parse-and-smtp_st.patch (+194/-0)
debian/patches/CVE-2020-109xx/0007-lib-smtp-test-smtp-server-errors-Add-tests-for-VRFY-.patch (+343/-0)
debian/patches/CVE-2020-109xx/0008-lib-smtp-smtp-server-command-Guarantee-that-non-dest.patch (+30/-0)
debian/patches/CVE-2020-109xx/0009-lib-smtp-smtp-server-command-Assign-cmd-reg-immediat.patch (+71/-0)
debian/patches/CVE-2020-109xx/0010-lib-smtp-smtp-server-command-Perform-initial-command.patch (+83/-0)
debian/patches/CVE-2020-109xx/0011-lib-smtp-smtp-server-connection-Hold-a-command-refer.patch (+51/-0)
debian/patches/CVE-2020-109xx/0012-lib-smtp-test-smtp-server-errors-Add-tests-for-large.patch (+200/-0)
debian/patches/CVE-2020-109xx/0013-lib-smtp-smtp-address-Don-t-return-NULL-from-smtp_ad.patch (+64/-0)
debian/patches/CVE-2020-109xx/0014-lib-smtp-smtp-address-Don-t-recognize-an-address-wit.patch (+29/-0)
debian/patches/CVE-2020-109xx/0015-lmtp-lmtp-commands-Explicity-prohibit-empty-RCPT-pat.patch (+37/-0)
debian/patches/CVE-2020-12100/0001-lib-mail-test-message-parser-Add-another-test-for-bo.patch (+97/-0)
debian/patches/CVE-2020-12100/0001-lib-sieve-Adjust-to-message_parser_init-API-change.patch (+62/-0)
debian/patches/CVE-2020-12100/0002-lib-mail-test-message-parser-Test-that-children_coun.patch (+212/-0)
debian/patches/CVE-2020-12100/0003-lib-mail-Move-message_parser_init_from_parts-handlin.patch (+923/-0)
debian/patches/CVE-2020-12100/0004-lib-mail-message-parser-Add-a-message_part_finish-he.patch (+70/-0)
debian/patches/CVE-2020-12100/0005-lib-mail-message-parser-Change-message_part_append-t.patch (+65/-0)
debian/patches/CVE-2020-12100/0006-lib-mail-message-parser-Optimize-updating-children_c.patch (+43/-0)
debian/patches/CVE-2020-12100/0007-lib-mail-message-parser-Optimize-appending-new-part-.patch (+91/-0)
debian/patches/CVE-2020-12100/0008-lib-mail-message-parser-Minor-code-cleanup-to-findin.patch (+39/-0)
debian/patches/CVE-2020-12100/0009-lib-mail-message-parser-Truncate-excessively-long-MI.patch (+153/-0)
debian/patches/CVE-2020-12100/0010-lib-mail-message-parser-Optimize-boundary-lookups-wh.patch (+65/-0)
debian/patches/CVE-2020-12100/0011-lib-mail-message-parser-Add-boundary_remove_until-he.patch (+44/-0)
debian/patches/CVE-2020-12100/0012-lib-mail-message-parser-Don-t-use-memory-pool-for-pa.patch (+167/-0)
debian/patches/CVE-2020-12100/0013-lib-mail-global-message_parser_init-Convert-flags-to.patch (+569/-0)
debian/patches/CVE-2020-12100/0014-lib-mail-message-parser-Support-limiting-max-number-.patch (+328/-0)
debian/patches/CVE-2020-12100/0015-lib-mail-message-parser-Support-limiting-max-number-.patch (+196/-0)
debian/patches/CVE-2020-12100/0016-lib-mail-Fix-handling-trailing-in-MIME-boundaries.patch (+120/-0)
debian/patches/CVE-2020-12673/0002-lib-ntlm-Check-buffer-length-on-responses.patch (+34/-0)
debian/patches/CVE-2020-12674/0001-auth-mech-rpa-Fail-on-zero-len-buffer.patch (+25/-0)
debian/patches/CVE-2020-24386-1.patch (+25/-0)
debian/patches/CVE-2020-24386-2.patch (+191/-0)
debian/patches/CVE-2020-25275-1.patch (+122/-0)
debian/patches/CVE-2020-25275-2.patch (+66/-0)
debian/patches/CVE-2021-33515.patch (+27/-0)
debian/patches/handle-unbounded-mime.patch (+89/-0)
debian/patches/series (+44/-0)
Conflict in debian/changelog
Conflict in debian/patches/CVE-2021-33515.patch
Conflict in debian/patches/series
Reviewer Review Type Date Requested Status
Bryce Harrington (community) Approve
Christian Ehrhardt (community) Needs Information
Utkarsh Gupta Pending
Review via email: mp+408909@code.staging.launchpad.net

Description of the change

Backports a patch from upstream, that two separate users have verified fixes the failure they're seeing.

I've not been able to reproduce this problem myself in my manually constructed inboxes. I haven't ruled out that this may depend on 3rd party software, or some atypical inbox format, or just that I didn't construct the test inbox adequately. In any case, now that we have two users who can reproduce both the problem and it's fix, and that the fix is well-vetted upstream and carried already in hirsute and newer, I figure we can move ahead with the sru for focal and rely on user testing for validation.

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

Utkarsh, since you have looked at the 2nd report on this issue, would appreciate your review on this. If you've done further analysis than me, I'd love to share notes.

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

The MP is proposed against impish which breaks the LP UI, but I can have a look in git locally.

Revision history for this message
Christian Ehrhardt (paelzer) wrote :

commit e95080643b1f66b2b536bb55c80f54bca845727a (HEAD, bryce/ubuntu/focal-devel)
Author: Bryce Harrington <email address hidden>
Date: Tue Apr 20 15:24:44 2021 -0700

    changelog

commit 6503cd961d55e789947286881c3c8e02cb76c64a
Author: Bryce Harrington <email address hidden>
Date: Sun Apr 11 13:23:59 2021 -0700

      * d/p/handle-unbounded-mime.patch: Fix crash during deinit when
        searching mails with non-ending MIME boundaries.
        (LP: #1912118)

That is all that it really is.

The patch content LGTM, also the changelog is fine.
It probably is cherry-picked from upstream a668d767a710ca18ab6e7177d8e8be22a6b024fb and I can derive that. But we'd usually expect that some more dep-3 headers are added like an Origin.

Up to you if you want to fix/adapt that before an upload, the rest is ok.

review: Needs Information
Revision history for this message
Bryce Harrington (bryce) wrote :

I've added the dep3 headers, thanks for flagging that.

triage-focal+20.04:~/pkg/Dovecot/sru-lp1912118/dovecot-gu-focal$ debuild -S $(git ubuntu push-for-upload)
...
Successfully signed dsc, buildinfo, changes files

triage-focal+20.04:~/pkg/Dovecot/sru-lp1912118$ grep ^Vcs dovecot_2.3.7.2-1ubuntu3.5_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/dovecot
Vcs-Git-Commit: 2d80217ad52c99e9ce691835d6a2bfa28aa0e279
Vcs-Git-Ref: refs/heads/sru-lp1912118-focal

triage-focal+20.04:~/pkg/Dovecot/sru-lp1912118$ dput ubuntu dovecot_2.3.7.2-1ubuntu3.5_source.changes
Checking signature on .changes
gpg: /home/bryce/pkg/Dovecot/sru-lp1912118/dovecot_2.3.7.2-1ubuntu3.5_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: /home/bryce/pkg/Dovecot/sru-lp1912118/dovecot_2.3.7.2-1ubuntu3.5.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading dovecot_2.3.7.2-1ubuntu3.5.dsc: done.
  Uploading dovecot_2.3.7.2-1ubuntu3.5.debian.tar.xz: done.
  Uploading dovecot_2.3.7.2-1ubuntu3.5_source.buildinfo: done.
  Uploading dovecot_2.3.7.2-1ubuntu3.5_source.changes: done.
Successfully uploaded packages.

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches