From patchwork Wed Nov 25 10:59:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dumitru Ceara X-Patchwork-Id: 1406014 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QXBhfa3l; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgyZl1SrVz9sRK for ; Wed, 25 Nov 2020 21:59:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 62F438740B; Wed, 25 Nov 2020 10:59:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rquIXc0vgzPE; Wed, 25 Nov 2020 10:59:40 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by hemlock.osuosl.org (Postfix) with ESMTP id AA21787406; Wed, 25 Nov 2020 10:59:40 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 94B1BC0891; Wed, 25 Nov 2020 10:59:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 1261FC0052 for ; Wed, 25 Nov 2020 10:59:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EC4BD86E0E for ; Wed, 25 Nov 2020 10:59:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QSA3Y5sak4fP for ; Wed, 25 Nov 2020 10:59:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by whitealder.osuosl.org (Postfix) with ESMTPS id F1FD686DF0 for ; Wed, 25 Nov 2020 10:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606301976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type; bh=+xDna/FPijkQeg2tRtOKe9V2NZcpQvSCfktHsmS94aw=; b=QXBhfa3lBpms1GM7M3Mxoqbj2HIm7osPAb+nDHueCBpM+6FwxSlnyp3tXz3vsdtE1MBnZ4 L0QTvhI0fYIYo0XNeqjomry/p3FKOnKXlqxSHh/obNYAnQQA0NE72bxJ3anIk0+2GVMDw8 At2vnZi4GS/YyrSphMRb+ZC8TqM9lQM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-170-K2vSwxHcOL2_0Vh7zNpp-A-1; Wed, 25 Nov 2020 05:59:34 -0500 X-MC-Unique: K2vSwxHcOL2_0Vh7zNpp-A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BF7D81084428; Wed, 25 Nov 2020 10:59:33 +0000 (UTC) Received: from dceara.remote.csb (ovpn-115-119.ams2.redhat.com [10.36.115.119]) by smtp.corp.redhat.com (Postfix) with ESMTP id C41421349A; Wed, 25 Nov 2020 10:59:29 +0000 (UTC) From: Dumitru Ceara To: dev@openvswitch.org Date: Wed, 25 Nov 2020 11:59:16 +0100 Message-Id: <1606301956-31791-1-git-send-email-dceara@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dceara@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [ovs-dev] [PATCH ovn] pinctrl: Fix race condition when accessing br_int_name. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" Reading pctrl->br_int_name must be done while holding the pinctrl_mutex. Otherwise we risk accessing freed memory. Fixes: 6b72068202f1 ("ovn-controller: Add a new thread in pinctrl module to handle packet-ins.") Signed-off-by: Dumitru Ceara --- controller/pinctrl.c | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/controller/pinctrl.c b/controller/pinctrl.c index 919eae4..e56ccbc 100644 --- a/controller/pinctrl.c +++ b/controller/pinctrl.c @@ -3011,6 +3011,23 @@ notify_pinctrl_main(void) seq_change(pinctrl_main_seq); } +static void +pinctrl_rconn_setup(struct rconn *swconn, const char *br_int_name) + OVS_REQUIRES(pinctrl_mutex) +{ + if (br_int_name) { + char *target = xasprintf("unix:%s/%s.mgmt", ovs_rundir(), br_int_name); + + if (strcmp(target, rconn_get_target(swconn))) { + VLOG_INFO("%s: connecting to switch", target); + rconn_connect(swconn, target, target); + } + free(target); + } else { + rconn_disconnect(swconn); + } +} + /* pinctrl_handler pthread function. */ static void * pinctrl_handler(void *arg_) @@ -3022,7 +3039,6 @@ pinctrl_handler(void *arg_) * rconn_get_connection_seqno(rconn), 'swconn' has reconnected. */ unsigned int conn_seq_no = 0; - char *br_int_name = NULL; uint64_t new_seq; /* Next IPV6 RA in seconds. */ @@ -3037,27 +3053,8 @@ pinctrl_handler(void *arg_) swconn = rconn_create(5, 0, DSCP_DEFAULT, 1 << OFP15_VERSION); while (!latch_is_set(&pctrl->pinctrl_thread_exit)) { - if (pctrl->br_int_name) { - if (!br_int_name || strcmp(br_int_name, pctrl->br_int_name)) { - free(br_int_name); - br_int_name = xstrdup(pctrl->br_int_name); - } - } - - if (br_int_name) { - char *target; - - target = xasprintf("unix:%s/%s.mgmt", ovs_rundir(), br_int_name); - if (strcmp(target, rconn_get_target(swconn))) { - VLOG_INFO("%s: connecting to switch", target); - rconn_connect(swconn, target, target); - } - free(target); - } else { - rconn_disconnect(swconn); - } - ovs_mutex_lock(&pinctrl_mutex); + pinctrl_rconn_setup(swconn, pctrl->br_int_name); ip_mcast_snoop_run(); ovs_mutex_unlock(&pinctrl_mutex); @@ -3113,19 +3110,17 @@ pinctrl_handler(void *arg_) poll_block(); } - free(br_int_name); rconn_destroy(swconn); return NULL; } static void pinctrl_set_br_int_name_(char *br_int_name) + OVS_REQUIRES(pinctrl_mutex) { if (br_int_name && (!pinctrl.br_int_name || strcmp(pinctrl.br_int_name, br_int_name))) { - if (pinctrl.br_int_name) { - free(pinctrl.br_int_name); - } + free(pinctrl.br_int_name); pinctrl.br_int_name = xstrdup(br_int_name); /* Notify pinctrl_handler that integration bridge is * set/changed. */