mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
To: barebox@lists.infradead.org
Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Subject: [PATCH 4/8] tftp: accept OACK + DATA datagrams only in certain states
Date: Sun, 28 Aug 2022 16:02:27 +0200	[thread overview]
Message-ID: <20220828140231.930643-5-enrico.scholz@sigma-chemnitz.de> (raw)
In-Reply-To: <20220828140231.930643-1-enrico.scholz@sigma-chemnitz.de>

These packets are valid in certain points of the transfer only and
accepting them too early or too late can corrupt internal states.

Reject them when they are unexpected.

Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
---
 fs/tftp.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/fs/tftp.c b/fs/tftp.c
index 610483d23c40..fb6c368b3a64 100644
--- a/fs/tftp.c
+++ b/fs/tftp.c
@@ -690,6 +690,12 @@ static void tftp_recv(struct file_priv *priv,
 		break;
 
 	case TFTP_OACK:
+		if (priv->state != STATE_RRQ && priv->state != STATE_WRQ) {
+			pr_warn("OACK packet in %s state\n",
+				tftp_states[priv->state]);
+			break;
+		}
+
 		priv->tftp_con->udp->uh_dport = uh_sport;
 
 		if (tftp_parse_oack(priv, pkt, len) < 0) {
@@ -713,6 +719,12 @@ static void tftp_recv(struct file_priv *priv,
 			tftp_window_cache_reset(&priv->cache);
 		}
 
+		if (priv->state != STATE_RDATA) {
+			pr_warn("DATA packet in %s state\n",
+				tftp_states[priv->state]);
+			break;
+		}
+
 		tftp_handle_data(priv, block, pkt + 2, len);
 
 		break;
-- 
2.37.2




  parent reply	other threads:[~2022-08-28 14:05 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-28 14:02 [PATCH 0/8] tftp fixups Enrico Scholz
2022-08-28 14:02 ` [PATCH 1/8] tftp: make debug_assert() critical when selftest is enabled Enrico Scholz
2022-08-28 14:02 ` [PATCH 2/8] tftp: remove sanity check of first block Enrico Scholz
2022-08-28 14:02 ` [PATCH 3/8] tftp: split out allocation and cache initialization Enrico Scholz
2022-08-28 14:02 ` Enrico Scholz [this message]
2022-08-28 14:02 ` [PATCH 5/8] tftp: support non rfc 2347 servers Enrico Scholz
2022-08-28 14:02 ` [PATCH 6/8] tftp: do not set 'tsize' in wrq requests Enrico Scholz
2022-08-28 14:02 ` [PATCH 7/8] tftp: fix WRQ support Enrico Scholz
2022-08-28 14:02 ` [PATCH 8/8] tftp: add some documentation about windowsize support Enrico Scholz
2022-08-29 10:52 ` [PATCH 0/8] tftp fixups Ahmad Fatoum
2022-08-30  7:30   ` Sascha Hauer

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220828140231.930643-5-enrico.scholz@sigma-chemnitz.de \
    --to=enrico.scholz@sigma-chemnitz.de \
    --cc=barebox@lists.infradead.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox