From 127dc4ea9487397b1ab70447e2f44d091e44ab5f Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 10 May 2014 19:40:11 +0200 Subject: [PATCH 1/1] rtnl: message - move code around No functional change. --- src/libsystemd/sd-rtnl/rtnl-message.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c index d611207de..fb429864b 100644 --- a/src/libsystemd/sd-rtnl/rtnl-message.c +++ b/src/libsystemd/sd-rtnl/rtnl-message.c @@ -1154,10 +1154,6 @@ int socket_read_message(sd_rtnl *rtnl) { else len = (size_t)r; - if (len > rtnl->rbuffer_allocated) - /* message did not fit in read buffer */ - return -EIO; - for (cmsg = CMSG_FIRSTHDR(&msg); cmsg; cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS && @@ -1176,6 +1172,10 @@ int socket_read_message(sd_rtnl *rtnl) { /* not from the kernel, ignore */ return 0; + if (len > rtnl->rbuffer_allocated) + /* message did not fit in read buffer */ + return -EIO; + if (NLMSG_OK(rtnl->rbuffer, len) && rtnl->rbuffer->nlmsg_flags & NLM_F_MULTI) { multi_part = true; -- 2.30.2