| Message ID | 1467024096-17942-1-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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);
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(-)