From patchwork Mon Nov 16 12:24:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 324378 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3273807ils; Mon, 16 Nov 2020 04:26:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJwToJgPztMhXxx23rzn5W8XOPrtuLbWVwiJseGLTpODM7LRLAQgWe85hkTk92AQ+HPJjbRt X-Received: by 2002:a5b:852:: with SMTP id v18mr16320749ybq.294.1605529580107; Mon, 16 Nov 2020 04:26:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605529580; cv=none; d=google.com; s=arc-20160816; b=COxlSuheMP4+TnX0tg9BStaaP4l08J13gQqjof4MQIW4knhN+9ZuNgI9MSTBi8tpyS OR/Glj4O1pLT998GBJyFWaBzY/3D6dWK1pk3hkcdbZveOt8NHIrQoo/IK2keQkz61g1e 2nvcPAd3EnjyeC4BiXygNXcrxjFFcMC9tVAdgKtRvPWoiDLuc1lcgI0OZNWecEyaDNqq xNbVgTIdVcgq9v5Gh6V71iR6azUpf+B06DgUsiuXOoViAqUbJWwaXFyKOPz9Aa3auGJy yqx6lN1u+2zTcHUalt4qY0yy6JUM9gVTXDdmnbIbQYA7DVzggCwyn8oEX51qauAEKm4F kifw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=zd36bEnryeQaHWHJSjvHzqGrH8fim6jYM/QnIrK9Ve4=; b=SczWofVJ3wv14owecQ83tM3HVuAyWGvWMUEdOB+xJvk9NWID0CS/8W8sRFGTlacOgk S9rTXJBG+4Q851safSd33K75PcUlXIC6dcv0FddfNIKLAEEiI1opedJETY29+CNNqUR+ 2cuGCZ5MQXS7flCMj0gxCyBiMrdjfnhvzBKwRlKR81Ps3F7jCjhxz6W0RpUEym2X+X9u SnpVpnT2p5o52vSfw4ZHqNcB30GJcaZjFf5cbaTPYhFhBLfaOiDDO822E1SIsF7bPnfC +udkqQcEkBfudhl3J1X8GOU8+Jh2NGzr+fcsQjTCnABjuZiQLwgqTI5RMkhAMbtUtrVB Yzkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lxXzheFI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v8si16837113ybq.437.2020.11.16.04.26.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 04:26:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=lxXzheFI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedaN-0002ge-JU for patch@linaro.org; Mon, 16 Nov 2020 07:26:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYY-0001UV-Lg for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:26 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45537) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYW-00037t-AF for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:26 -0500 Received: by mail-wr1-x42c.google.com with SMTP id p1so18439349wrf.12 for ; Mon, 16 Nov 2020 04:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zd36bEnryeQaHWHJSjvHzqGrH8fim6jYM/QnIrK9Ve4=; b=lxXzheFIEfvO5COIsQ4JTCW6OMHJlZ0ihB8+YzY4xHU6fRQXDMk4EwX1tmiwwZG0RK qGTCdjUyGDUPu3ou1QPtsFo6MmA3j2VETNW1TX4xI7gPsUfXymIubQc64y+ixtwD59Ei IG4M9VX+3QIbu+vAGlr7KuhEcfYV54qOXuD634yxC9n/HdvQhLPSFDByVgYIneqG3j0X GZ7pq8tr4U7UZue4SKht+LrM3zSvX5xHSopqoOr+B1j9UXdcxyCV+7u+SJlSM/2vL1mH kLYUd7msDlVlLNmm7XNbV095l7pm68ZQQMWMPFIRZ16+GJJ8+GRhsjMRyxal+Vv+WfXv BqSQ== 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:mime-version:content-transfer-encoding; bh=zd36bEnryeQaHWHJSjvHzqGrH8fim6jYM/QnIrK9Ve4=; b=ugc1pjV4HPdcpFe0i/ignADL75TWBDgbdNeymFV0ghcIc4pK6XToFFxczR5SXvd4la BFptrkEmpAvz50KQMBmmM1TwH/7yESjGoxpVugpbn/GBgjxbMhzWUsCd/KkEIqOJAJGj KZF14BBdoLY7aiwUVMWkg+4bK3JhE585lmBjnYdT2WXqTwymsvRBn2C5iWWD03fM4AKo r7Wx0/QndDjj0cAm30vcob/c8RhzMxR7DJ8fuwaoeJp03y91NS+e9g5Zb0hwpzdgyQHV 8guk2b0u54hvlnSaMLoCdFcV13JAmq2GEdyOKJU/1XHYKpo0vjDeza5W2DC0j82rMnKb MRrQ== X-Gm-Message-State: AOAM531eMZIVJKtlSO2ZzAG5TtihXLwrzJUZ6veL2jBeEfkCTi8RKAHe On3HZ2ruDss/seXbVvZEGUyH0A== X-Received: by 2002:adf:f852:: with SMTP id d18mr18270630wrq.232.1605529462406; Mon, 16 Nov 2020 04:24:22 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id q17sm26118448wro.36.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 013761FF8C; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 2/9] plugins: Fix two resource leaks in setup_socket() Date: Mon, 16 Nov 2020 12:24:10 +0000 Message-Id: <20201116122417.28346-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Chen , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Euler Robot Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Chen Either accept() fails or exits normally, we need to close the fd. Reported-by: Euler Robot Signed-off-by: Alex Chen Signed-off-by: Alex Bennée Message-Id: <20201109082829.87496-3-alex.chen@huawei.com> Message-Id: <20201110192316.26397-3-alex.bennee@linaro.org> -- 2.20.1 diff --git a/contrib/plugins/lockstep.c b/contrib/plugins/lockstep.c index 319bd44b83..5aad50869d 100644 --- a/contrib/plugins/lockstep.c +++ b/contrib/plugins/lockstep.c @@ -268,11 +268,13 @@ static bool setup_socket(const char *path) socket_fd = accept(fd, NULL, NULL); if (socket_fd < 0 && errno != EINTR) { perror("accept socket"); + close(fd); return false; } qemu_plugin_outs("setup_socket::ready\n"); + close(fd); return true; }