[Qemu-devel] [PATCH] slirp: Remove superfluous memset() calls from the TFTP code

[Qemu-devel] [PATCH] slirp: Remove superfluous memset() calls from the TFTP code

[Thomas Huth]

Commit fad7fb9ccd8013ea03  ("Add IPv6 support to the TFTP code")
refactored some common code for preparing the mbuf into a new
function called tftp_prep_mbuf_data(). One part of this common
code is to do a "memset(m->m_data, 0, m->m_size);" for the related
buffer first. However, at two spots, the memset() was not removed
from the calling function, so it currently done twice in these code
paths. Thus let's delete these superfluous memsets in the calling
functions now.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 slirp/tftp.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/slirp/tftp.c b/slirp/tftp.c
index 12b5ff6..3673402 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -208,8 +208,6 @@ static void tftp_send_error(struct tftp_session *spt,
     goto out;
   }
 
-  memset(m->m_data, 0, m->m_size);
-
   tp = tftp_prep_mbuf_data(spt, m);
 
   tp->tp_op = htons(TFTP_ERROR);
@@ -237,8 +235,6 @@ static void tftp_send_next_block(struct tftp_session *spt,
     return;
   }
 
-  memset(m->m_data, 0, m->m_size);
-
   tp = tftp_prep_mbuf_data(spt, m);
 
   tp->tp_op = htons(TFTP_DATA);
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] slirp: Remove superfluous memset() calls from the TFTP code

[Samuel Thibault]

Thomas Huth, on Mon 27 Jun 2016 12:41:36 +0200, wrote:
> Commit fad7fb9ccd8013ea03  ("Add IPv6 support to the TFTP code")
> refactored some common code for preparing the mbuf into a new
> function called tftp_prep_mbuf_data(). One part of this common
> code is to do a "memset(m->m_data, 0, m->m_size);" for the related
> buffer first. However, at two spots, the memset() was not removed
> from the calling function, so it currently done twice in these code
> paths. Thus let's delete these superfluous memsets in the calling
> functions now.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Thanks!

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  slirp/tftp.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/slirp/tftp.c b/slirp/tftp.c
> index 12b5ff6..3673402 100644
> --- a/slirp/tftp.c
> +++ b/slirp/tftp.c
> @@ -208,8 +208,6 @@ static void tftp_send_error(struct tftp_session *spt,
>      goto out;
>    }
>  
> -  memset(m->m_data, 0, m->m_size);
> -
>    tp = tftp_prep_mbuf_data(spt, m);
>  
>    tp->tp_op = htons(TFTP_ERROR);
> @@ -237,8 +235,6 @@ static void tftp_send_next_block(struct tftp_session *spt,
>      return;
>    }
>  
> -  memset(m->m_data, 0, m->m_size);
> -
>    tp = tftp_prep_mbuf_data(spt, m);
>  
>    tp->tp_op = htons(TFTP_DATA);
> -- 
> 1.8.3.1
> 

-- 
Samuel
<macavity> bash: ls: Computer bought the farm
<macavity> THAT frightens ppl! :P
<macavity> id rather see: "bash: ls: Initialization of googol(AWAX)
        disengaged in HYPER32/64 mode due to faulty page request at
        AX:12A34F84B"
<macavity> at least that would give me the feeling that the
        *programmers* knows what is going on :P
(lovely Hurd...)