summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorJukka Rissanen <jukka.rissanen@linux.intel.com>2017-02-06 15:20:31 +0200
committerJukka Rissanen <jukka.rissanen@linux.intel.com>2017-02-08 10:12:34 +0200
commitb9ac440d02210228529329378a0759c89cb2ab46 (patch)
treef256efdd50ad2d5eca1d648253bd237c46a3deb9 /samples
parentbaa4939b9473e7e4bab4ae29fc0c05bd1492731b (diff)
samples: net: Fix invalid memory access for TCP
Set protocol family value only after the buf is verified to be non-null. Change-Id: I0ce7bab3539087d0f522b4bb3024f46a7eb3c15f Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Diffstat (limited to 'samples')
-rw-r--r--samples/net/echo_server/src/echo-server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/samples/net/echo_server/src/echo-server.c b/samples/net/echo_server/src/echo-server.c
index 4d6b2c3b2..2344c12ed 100644
--- a/samples/net/echo_server/src/echo-server.c
+++ b/samples/net/echo_server/src/echo-server.c
@@ -429,8 +429,8 @@ static void tcp_received(struct net_context *context,
void *user_data)
{
static char dbg[MAX_DBG_PRINT + 1];
- sa_family_t family = net_nbuf_family(buf);
struct net_buf *reply_buf;
+ sa_family_t family;
int ret;
if (!buf) {
@@ -438,6 +438,8 @@ static void tcp_received(struct net_context *context,
return;
}
+ family = net_nbuf_family(buf);
+
snprintk(dbg, MAX_DBG_PRINT, "TCP IPv%c",
family == AF_INET6 ? '6' : '4');