From b878b167cba028d7ab264d100a6c2c4bf3a460f3 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Tue, 30 Aug 2022 09:38:10 +0200 Subject: tftp: detect out-of-memory situations it should never happen due to the program logic; but detect a failed kfifo_put() just in case... Signed-off-by: Enrico Scholz Link: https://lore.barebox.org/20220830073816.2694734-16-enrico.scholz@sigma-chemnitz.de Signed-off-by: Sascha Hauer --- fs/tftp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'fs') diff --git a/fs/tftp.c b/fs/tftp.c index 5b0dcb2b75..cabe923329 100644 --- a/fs/tftp.c +++ b/fs/tftp.c @@ -301,6 +301,8 @@ err: static void tftp_put_data(struct file_priv *priv, uint16_t block, void const *pkt, size_t len) { + unsigned int sz; + if (len > priv->blocksize) { pr_warn("tftp: oversized packet (%zu > %d) received\n", len, priv->blocksize); @@ -309,9 +311,14 @@ static void tftp_put_data(struct file_priv *priv, uint16_t block, priv->last_block = block; - kfifo_put(priv->fifo, pkt, len); + sz = kfifo_put(priv->fifo, pkt, len); - if (len < priv->blocksize) { + if (sz != len) { + pr_err("tftp: not enough room in kfifo (only %u out of %zu written)\n", + sz, len); + priv->err = -ENOMEM; + priv->state = STATE_DONE; + } else if (len < priv->blocksize) { tftp_send(priv); priv->err = 0; priv->state = STATE_DONE; -- cgit v1.2.1