From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Tan <jonathantanmy@google.com>,
Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH v2 3/3] sideband: add defense against packets missing a band designator
Date: Mon, 19 Oct 2020 19:35:42 +0000 [thread overview]
Message-ID: <c61e560451c4d7f101a23acec69117ddac563330.1603136143.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.753.v2.git.1603136142.gitgitgadget@gmail.com>
From: Johannes Schindelin <johannes.schindelin@gmx.de>
While there is currently no instance of code producing this type of
packet, if the `demultiplex_sideband()` would receive a packet whose
payload is not only empty but even misses the band designator, it would
mistake it for a flush packet.
Let's defend against such a bug in the future.
Note: `demultiplex_sideband()` will treat empty flush, delim, eof and
response-end packets all alike: it will treat them as flush packets.
Since empty packets by definition are missing a band designator, this is
the best that function can do. Therefore, it would make little sense to
pass the `status` on to `demultiplex_sideband()`. Besides, fbd76cd450
(sideband: reverse its dependency on pkt-line, 2019-01-16) went out of
its way to _stop_ the code inside `demultiplex_sideband()` from relying
on anything in `pkt-line.h`; that includes the data type `enum
packet_read_status` that we would need if we were to pass `status` as a
parameter to that function.
Based on a suggestion by Jeff King.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
pkt-line.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/pkt-line.c b/pkt-line.c
index 657a702927..f72048f623 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -461,8 +461,10 @@ int recv_sideband(const char *me, int in_stream, int out)
enum sideband_type sideband_type;
while (1) {
- len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX,
- 0);
+ int status = packet_read_with_status(in_stream, NULL, NULL, buf,
+ LARGE_PACKET_MAX, &len, 0);
+ if (!len && status == PACKET_READ_NORMAL)
+ BUG("missing band designator");
if (!demultiplex_sideband(me, buf, len, 0, &scratch,
&sideband_type))
continue;
@@ -520,6 +522,8 @@ enum packet_read_status packet_reader_read(struct packet_reader *reader)
reader->options);
if (!reader->use_sideband)
break;
+ if (!reader->pktlen && reader->status == PACKET_READ_NORMAL)
+ BUG("missing band designator");
if (demultiplex_sideband(reader->me, reader->buffer,
reader->pktlen, 1, &scratch,
&sideband_type))
--
gitgitgadget
next prev parent reply other threads:[~2020-10-19 19:35 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 14:45 [PATCH] t5500.43: make the check a bit more robust Johannes Schindelin via GitGitGadget
2020-10-13 17:53 ` Junio C Hamano
2020-10-13 18:55 ` Jeff King
2020-10-13 19:07 ` Junio C Hamano
2020-10-13 19:09 ` Jeff King
2020-10-17 3:31 ` Johannes Schindelin
2020-10-17 2:34 ` Johannes Schindelin
2020-10-19 19:35 ` [PATCH v2 0/3] Work around flakiness in t5500.43 Johannes Schindelin via GitGitGadget
2020-10-19 19:35 ` [PATCH v2 1/3] sideband: avoid reporting incomplete sideband messages Johannes Schindelin via GitGitGadget
2020-10-20 20:33 ` Junio C Hamano
2020-10-20 20:48 ` Johannes Schindelin
2020-10-20 21:33 ` Junio C Hamano
2020-10-19 19:35 ` [PATCH v2 2/3] sideband: report unhandled incomplete sideband messages as bugs Johannes Schindelin via GitGitGadget
2020-10-19 19:35 ` Johannes Schindelin via GitGitGadget [this message]
2020-10-20 20:36 ` [PATCH v2 3/3] sideband: add defense against packets missing a band designator Junio C Hamano
2020-10-23 8:34 ` Jeff King
2020-10-23 14:44 ` Junio C Hamano
2020-10-23 8:48 ` Jeff King
2020-10-23 5:36 ` Johannes Schindelin
2020-10-23 8:50 ` [PATCH v2 0/3] Work around flakiness in t5500.43 Jeff King
2020-10-26 16:04 ` Johannes Schindelin
2020-10-26 16:09 ` [PATCH v3 0/2] " Johannes Schindelin via GitGitGadget
2020-10-26 16:09 ` [PATCH v3 1/2] sideband: avoid reporting incomplete sideband messages Johannes Schindelin via GitGitGadget
2020-10-26 16:09 ` [PATCH v3 2/2] sideband: report unhandled incomplete sideband messages as bugs Johannes Schindelin via GitGitGadget
2020-10-26 18:33 ` [PATCH v3 0/2] Work around flakiness in t5500.43 Junio C Hamano
2020-10-27 6:52 ` [PATCH] sideband: diagnose more incoming packet anomalies Jeff King
2020-10-27 7:12 ` Jeff King
2020-10-27 18:56 ` Junio C Hamano
2020-10-27 20:42 ` Jeff King
2020-10-27 21:38 ` Junio C Hamano
2020-10-28 9:33 ` Jeff King
2020-10-27 7:13 ` Jeff King
2020-10-27 19:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c61e560451c4d7f101a23acec69117ddac563330.1603136143.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).