From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id D803D2B95 for ; Sun, 22 Apr 2018 17:10:37 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 7840920FF9; Sun, 22 Apr 2018 11:10:37 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:10:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=p2v32KaAtD4fLxS0R +K8epZ+wAgyx9wxbb7YMvjlF6U=; b=duhO/a2Snxm0bW2bfP40eZCpSoKQ/h/aw +4uYScmtyXBHRMjViQ9JA10R3Bzb1250v8IvrEtL87s7lreLc3DjQsfO/vL/jx/Z 2oCjqmfZTvep6CLJ3CbDDUXlnu2G/Ec0DxrByydRhB7GbUjWzJTJV8dGyYmxPLL2 5r+c7j6+Htgom1Ez8nLsdwvf91bnzrC89+knMqN2LR6NhkzTo33JPa5GmU2HaCLc QVoSN1wDXMYrXha8mF2y8rgpOOTd4asp7A0NiLL7wYend134sv/zUDjYnvTEfvhj rac3oB/46HIvcnbHly5OSyDq3a+4hOuKVVuLWNKiDV+WyifYl3iFw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=p2v32KaAtD4fLxS0R+K8epZ+wAgyx9wxbb7YMvjlF6U=; b=h9up2dDq hyNaFaMr5uSRuDViUUX3QHeI6ubGGI9tZOKKPbeJhFEEosUjsS5GVd41MXs9Dsaf gc/ntfWwn8Di4aTYLR54yuUNlqTsW/Xq+hGt3Rtpfceq7tNs59Q0wMUxhrsdI0uH WsB3rJlupvIHh11S/KzsEaCgoPuZS/HqHQPGfx4hn+NZmfktCFaPI5a6LWKvYk5X JDQRCnhHispceKnGJ5/nWfaDgJm5kd8TTLI4DuYzmlte5i6PTX6W9nKAUJb5WZEu qDylMn/WOO8SDsMYBzt2sOPB0cLCsJFUjojn/hRzITtOBb2TKfzbJ6/nXbsPqsOv 1YsLmUxw+A+Hzw== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id 000D110253; Sun, 22 Apr 2018 11:10:34 -0400 (EDT) From: Yuanhan Liu To: Tomasz Kulasek Cc: Pawel Wodkowski , Jianfeng Tan , Maxime Coquelin , dpdk stable Date: Sun, 22 Apr 2018 23:09:00 +0800 Message-Id: <20180422150949.17523-10-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'vhost: check cmsg not null' has been queued to LTS release 17.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Apr 2018 15:10:38 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From 188887c74f8854e6a471f25a9e96c008d632d63d Mon Sep 17 00:00:00 2001 From: Tomasz Kulasek Date: Fri, 9 Feb 2018 18:05:00 +0100 Subject: [PATCH] vhost: check cmsg not null [ upstream commit aa001111b002a05bf126c688d06146c092c0795a ] Fixes: 8f972312b8f4 ("vhost: support vhost-user") Signed-off-by: Pawel Wodkowski Signed-off-by: Tomasz Kulasek Reviewed-by: Jianfeng Tan Reviewed-by: Maxime Coquelin --- lib/librte_vhost/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 811e6bf16..72831b347 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -181,6 +181,11 @@ send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num) msgh.msg_control = control; msgh.msg_controllen = sizeof(control); cmsg = CMSG_FIRSTHDR(&msgh); + if (cmsg == NULL) { + RTE_LOG(ERR, VHOST_CONFIG, "cmsg == NULL\n"); + errno = EINVAL; + return -1; + } cmsg->cmsg_len = CMSG_LEN(fdsize); cmsg->cmsg_level = SOL_SOCKET; cmsg->cmsg_type = SCM_RIGHTS; -- 2.11.0