|
 |
1bdc94 |
From 37e3851f6eac7999e7c5a7cfd41d53f72e47b03d Mon Sep 17 00:00:00 2001
|
|
|
12f46f |
From: Xiao Wang <jasowang@redhat.com>
|
|
|
1bdc94 |
Date: Wed, 8 Aug 2018 07:52:56 +0200
|
|
|
1bdc94 |
Subject: [PATCH 1/5] slirp: reformat m_inc routine
|
|
|
12f46f |
|
|
|
12f46f |
RH-Author: Xiao Wang <jasowang@redhat.com>
|
|
|
1bdc94 |
Message-id: <1533714777-24827-2-git-send-email-jasowang@redhat.com>
|
|
|
1bdc94 |
Patchwork-id: 81675
|
|
|
1bdc94 |
O-Subject: [RHEL-7.6/7.5z qemu-kvm-rhev 1/2] slirp: reformat m_inc routine
|
|
|
1bdc94 |
Bugzilla: 1586255
|
|
|
12f46f |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
12f46f |
RH-Acked-by: wexu@redhat.com
|
|
|
12f46f |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
12f46f |
|
|
|
12f46f |
From: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
12f46f |
|
|
|
12f46f |
Coding style changes to the m_inc routine and minor refactoring.
|
|
|
12f46f |
|
|
|
12f46f |
Reported-by: ZDI Disclosures <zdi-disclosures@trendmicro.com>
|
|
|
12f46f |
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
|
|
|
12f46f |
Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
|
|
|
12f46f |
(cherry picked from commit c22098c74a09164797fae6511c5eaf68f32c4dd8)
|
|
|
12f46f |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
12f46f |
---
|
|
|
12f46f |
slirp/mbuf.c | 34 ++++++++++++++++------------------
|
|
|
12f46f |
1 file changed, 16 insertions(+), 18 deletions(-)
|
|
|
12f46f |
|
|
|
12f46f |
diff --git a/slirp/mbuf.c b/slirp/mbuf.c
|
|
|
12f46f |
index 18cbf75..0c189e1 100644
|
|
|
12f46f |
--- a/slirp/mbuf.c
|
|
|
12f46f |
+++ b/slirp/mbuf.c
|
|
|
12f46f |
@@ -151,27 +151,25 @@ m_cat(struct mbuf *m, struct mbuf *n)
|
|
|
12f46f |
void
|
|
|
12f46f |
m_inc(struct mbuf *m, int size)
|
|
|
12f46f |
{
|
|
|
12f46f |
- int datasize;
|
|
|
12f46f |
+ int datasize;
|
|
|
12f46f |
|
|
|
12f46f |
- /* some compiles throw up on gotos. This one we can fake. */
|
|
|
12f46f |
- if(m->m_size>size) return;
|
|
|
12f46f |
+ /* some compilers throw up on gotos. This one we can fake. */
|
|
|
12f46f |
+ if (m->m_size > size) {
|
|
|
12f46f |
+ return;
|
|
|
12f46f |
+ }
|
|
|
12f46f |
|
|
|
12f46f |
- if (m->m_flags & M_EXT) {
|
|
|
12f46f |
- datasize = m->m_data - m->m_ext;
|
|
|
12f46f |
- m->m_ext = g_realloc(m->m_ext, size + datasize);
|
|
|
12f46f |
- m->m_data = m->m_ext + datasize;
|
|
|
12f46f |
- } else {
|
|
|
12f46f |
- char *dat;
|
|
|
12f46f |
- datasize = m->m_data - m->m_dat;
|
|
|
12f46f |
- dat = g_malloc(size + datasize);
|
|
|
12f46f |
- memcpy(dat, m->m_dat, m->m_size);
|
|
|
12f46f |
-
|
|
|
12f46f |
- m->m_ext = dat;
|
|
|
12f46f |
- m->m_data = m->m_ext + datasize;
|
|
|
12f46f |
- m->m_flags |= M_EXT;
|
|
|
12f46f |
- }
|
|
|
12f46f |
+ if (m->m_flags & M_EXT) {
|
|
|
12f46f |
+ datasize = m->m_data - m->m_ext;
|
|
|
12f46f |
+ m->m_ext = g_realloc(m->m_ext, size + datasize);
|
|
|
12f46f |
+ } else {
|
|
|
12f46f |
+ datasize = m->m_data - m->m_dat;
|
|
|
12f46f |
+ m->m_ext = g_malloc(size + datasize);
|
|
|
12f46f |
+ memcpy(m->m_ext, m->m_dat, m->m_size);
|
|
|
12f46f |
+ m->m_flags |= M_EXT;
|
|
|
12f46f |
+ }
|
|
|
12f46f |
|
|
|
12f46f |
- m->m_size = size + datasize;
|
|
|
12f46f |
+ m->m_data = m->m_ext + datasize;
|
|
|
12f46f |
+ m->m_size = size + datasize;
|
|
|
12f46f |
}
|
|
|
12f46f |
|
|
|
12f46f |
|
|
|
12f46f |
--
|
|
|
12f46f |
1.8.3.1
|
|
|
12f46f |
|