From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by dpdk.org (Postfix) with ESMTP id 658BB2B82 for ; Tue, 1 May 2018 12:46:41 +0200 (CEST) Received: by mail-wr0-f194.google.com with SMTP id q3-v6so10476805wrj.6 for ; Tue, 01 May 2018 03:46:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QJxjjVAxq9eU8kSHVTSXTggaG2e+2tlcqH6h5dxdsd0=; b=s5HOFiQPvsaeT5q3yb0E6ocUjNIxDIf7iiCIIHOSFHLVh3gEowXKliBpeMUKmAJrqr +uAclJWcEjC41agE7CITNSokl0jMOckpqGpB/8Ipe7zp6QRTQS19UoOz4CPghsBvqYMb bSym18xpaOp6AByAy5DNO4N+2hgMRJgoyPKhFTuKUWBRqunDTqW4L5dBF1IM+wSNRrRY HELd1ES8dgtUK9F3edIF78IGF+9BjaMMCnAlfExSzJvKyU1O9Dd/MW1oaePKq5tXyuXN er2D+krks7o2YO5aHaJKN3Fn/V2Hsn+XJsmR8ksJiPOWHLaTE2CQboqWHnhO/RVtIoQs sd/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QJxjjVAxq9eU8kSHVTSXTggaG2e+2tlcqH6h5dxdsd0=; b=ZRd6J0wEfrOmC1l7lQ3+mS369Yu35XNhvMgViTEp8QYiVtVT4tNv1RgIuJBRifDMV0 bl+wEe28mGjAOJfjDrLYeHocaZFLR/6UPPnsKozcy16u1si28+uuJJTokFkzMUWEJFdJ aGHZG9s9s5s7tVUDoRdZd7XuPkZT7+qviFldl6JM/S3RkLbWW2wSJGZwVeyPQk3iYNsR WZ24lokYRjaezifaj6gF37/R7sXC26FGdwk/BsoMyLPw7ZGoUmRxHI/SXWfjetGDDSEu yyP0IYQs7DC2kef1aBKLPGZERb3sw1YcpnJeJwt/f5nqEk9cVahO7lD38oRvZ25JpCm7 mQjg== X-Gm-Message-State: ALQs6tB+NYbwixDvLvPokN7kdihVDNo/adYH81BNH6mrYjoL6flFIRM9 g4WpEFfRMzcvbG1uifxL2/4I2QI5LlA= X-Google-Smtp-Source: AB8JxZrmL4EjsKII60mOymsAGIqeyWEcPpLbdenF08zUr8h9qoy4O5kFAmqnDbt3q0K49ApnLBRYEQ== X-Received: by 2002:adf:e9c3:: with SMTP id l3-v6mr12200319wrn.195.1525171601138; Tue, 01 May 2018 03:46:41 -0700 (PDT) Received: from localhost (slip139-92-244-193.lon.uk.prserv.net. [139.92.244.193]) by smtp.gmail.com with ESMTPSA id x65sm11283932wme.31.2018.05.01.03.46.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 May 2018 03:46:40 -0700 (PDT) From: luca.boccassi@gmail.com To: Tomasz Kulasek Cc: Pawel Wodkowski , Jianfeng Tan , Maxime Coquelin , dpdk stable Date: Tue, 1 May 2018 11:44:29 +0100 Message-Id: <20180501104509.17238-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180501104509.17238-1-luca.boccassi@gmail.com> References: <20180501104509.17238-1-luca.boccassi@gmail.com> Subject: [dpdk-stable] patch 'vhost: check cmsg not null' has been queued to LTS release 16.11.7 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: Tue, 01 May 2018 10:46:41 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/03/18. So please shout if anyone has objections. Thanks. Luca Boccassi --- >>From 3743dbcfc521395378338990a0e806c6d24ab12d 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 a95fbfbb9..b9fe25be7 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -166,6 +166,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.14.2