Ensure that bootp packets are at least BOOTP_MIN_LEN bytes long

diff --git a/bootp.c b/bootp.c
index 078dfb973c2a832a9547092277843de70ee6aac0..435f7a6415d3467b66f3eacf9714f36d7ba67d45 100644 (file)
--- a/bootp.c
+++ b/bootp.c
@@ -190,7 +190,8 @@ void bootp (packet)
           pack options into the filename and server name buffers. */
 
        cons_options (packet, &outgoing, options, 0);
-       
+       if (outgoing.packet_length < BOOTP_MIN_LEN)
+               outgoing.packet_length = BOOTP_MIN_LEN;
 
        /* Take the fields that we care about... */
        raw.op = BOOTREPLY;

diff --git a/server/bootp.c b/server/bootp.c
index 078dfb973c2a832a9547092277843de70ee6aac0..435f7a6415d3467b66f3eacf9714f36d7ba67d45 100644 (file)
--- a/server/bootp.c
+++ b/server/bootp.c
@@ -190,7 +190,8 @@ void bootp (packet)
           pack options into the filename and server name buffers. */
 
        cons_options (packet, &outgoing, options, 0);
-       
+       if (outgoing.packet_length < BOOTP_MIN_LEN)
+               outgoing.packet_length = BOOTP_MIN_LEN;
 
        /* Take the fields that we care about... */
        raw.op = BOOTREPLY;