From 9ebc9cceb67c978d6ffa5e5065de4ef9482b9e1a Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 26 Aug 2021 16:07:22 +0200 Subject: [PATCH] CLEANUP: htx: remove comments about "must be < 256 MB" Since commit "BUG/MINOR: config: reject configs using HTTP with bufsize >= 256 MB" we are now sure that it's not possible anymore to have an HTX block of a size 256 MB or more, even after concatenation thanks to the tests for len >= htx_free_data_space(). Let's remove these now obsolete comments. A BUG_ON() was added in htx_add_blk() to track any such exception if the conditions would change later, to complete the one that is performed on the start address that must remain within the buffer. (cherry picked from commit 3d5f19e04d88e7c8f71cba4ea12e383c91de89f6) Signed-off-by: Willy Tarreau (cherry picked from commit 86cb2cd3c68a0f3072a326def89449e10760423d) [wt: no change in htx.h, ctx updates in htx.c] Signed-off-by: Willy Tarreau --- src/htx.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/htx.c b/src/htx.c index b678da5..bc9ad76 100644 --- a/src/htx.c +++ b/src/htx.c @@ -316,6 +316,7 @@ struct htx_blk *htx_add_blk(struct htx *htx, enum htx_blk_type type, uint32_t bl { struct htx_blk *blk; + BUG_ON(blksz >= 256 << 20); blk = htx_reserve_nxblk(htx, blksz); if (!blk) return NULL; @@ -543,7 +544,6 @@ struct htx_blk *htx_add_data_atonce(struct htx *htx, struct ist data) goto add_new_block; append_data: - /* FIXME: check v.len + data.len < 256MB */ /* Append data and update the block itself */ ptr = htx_get_blk_ptr(htx, tailblk); memcpy(ptr+sz, data.ptr, len); @@ -557,7 +557,6 @@ struct htx_blk *htx_add_data_atonce(struct htx *htx, struct ist data) data.len -= len; add_new_block: - /* FIXME: check data.len (< 256MB) */ blk = htx_add_blk(htx, HTX_BLK_DATA, data.len); if (!blk) return NULL; @@ -852,7 +851,6 @@ struct htx_sl *htx_add_stline(struct htx *htx, enum htx_blk_type type, unsigned size = sizeof(*sl) + p1.len + p2.len + p3.len; - /* FIXME: check size (< 256MB) */ blk = htx_add_blk(htx, type, size); if (!blk) return NULL; @@ -1005,7 +1003,6 @@ size_t htx_add_data(struct htx *htx, const struct ist data) len = room; append_data: - /* FIXME: check v.len + data.len < 256MB */ /* Append data and update the block itself */ ptr = htx_get_blk_ptr(htx, tailblk); memcpy(ptr + sz, data.ptr, len); @@ -1018,7 +1015,6 @@ size_t htx_add_data(struct htx *htx, const struct ist data) return len; add_new_block: - /* FIXME: check data.len (< 256MB) */ blk = htx_add_blk(htx, HTX_BLK_DATA, len); if (!blk) return 0; -- 1.7.10.4