From patchwork Sat Jan 19 10:03:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 1027917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qQIQWv0V"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43hYM603gFz9s9G for ; Sat, 19 Jan 2019 21:04:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:53714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknUO-0001QQ-06 for incoming@patchwork.ozlabs.org; Sat, 19 Jan 2019 05:04:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55322) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gknTb-0001Mw-2w for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gknTZ-00083a-Pu for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:42 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39897) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gknTZ-0007xI-HI for qemu-devel@nongnu.org; Sat, 19 Jan 2019 05:03:41 -0500 Received: by mail-wr1-x442.google.com with SMTP id t27so17911906wra.6 for ; Sat, 19 Jan 2019 02:03:33 -0800 (PST) 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=38uBQMnzVhKMSVsXc4IUmypAMk+DIDMExaJvPDNuuKg=; b=qQIQWv0VYJlKATFbzfZehPS1ePjy+9UMxjNTYo7KSZAm3PQnSsQOnhows952VX9GIs Jr8Y0yk/3DivT0s2RMG6gLCLKUQ6piGAGO1nxVlwxBcjtAT+PE/gQB/bMBB3LLz4rfwG fVm+PiVUl17wWzHy4+ypa/VnFpdijb/AV0i5FrJMfJG3I6GUr1qDfz6yRlLk64UP/yVn woMQHFw+LKk2Xqge5KMn74gKDJoOgn3OzSHITiHHCAWLs+N+tLQmGaPJEzNA9XkZXjjX h4Q0ypl14KQ+Y4xHAs71WVgPTeCHqFB/leA9hOPf3cJFRhmefguIBHYeh/F8hMjvLG17 1msA== 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=38uBQMnzVhKMSVsXc4IUmypAMk+DIDMExaJvPDNuuKg=; b=tutt6CMfARHJvZwifOp3jsyU6oi+ACrL1FB5LXK7BchougRmZhgxZGWs5AedttO+ir 5xX3dqbISleCJ51LSvdfaEXpgdNYBOsCQXfp7Jh8nwEnRNw4jDIJpBmOV+NxxACmA62Y AH9QYQn+3mOetJEv4n44a40z5KgYLgXv60WYkvgJn/ytcz9o38xLk/rN4iBWHD2ASVbN L18YQVMsU9kpO1ukvgiPB1E2Ls7dAQlDIySjAB7/Nkg4khoGl/RhSHgNoZioIhRHynks rZMyZFT2NGSTFw/8BcitzRZf82xcVcixGfRkt2Y9oJ1rHnB/SFMNqEmC4GTyMm+P9N+2 ayFg== X-Gm-Message-State: AJcUuke3GA4NuppyhUu1371d5g2gXYyb2Hfq4EYA1pKnlI/1ivnHshoy sshGAgcY1uHBJ6NhXyBOHgB1rllH X-Google-Smtp-Source: ALg8bN5mK4azQOnARTCHg0YKwlkn3bQ/wtmwVaWLdrs/OvyYxIVYwDYrk/vfygfH6heEwARA6RFyag== X-Received: by 2002:a5d:4046:: with SMTP id w6mr20843629wrp.92.1547892212095; Sat, 19 Jan 2019 02:03:32 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id j8sm113868847wmd.0.2019.01.19.02.03.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 19 Jan 2019 02:03:31 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Sat, 19 Jan 2019 12:03:13 +0200 Message-Id: <20190119100315.23985-9-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> References: <20190119100315.23985-1-marcel.apfelbaum@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH PULL 08/10] contrib/rdmacm-mux: remove Wno-format-truncation flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cohuck@redhat.com, liq3ea@163.com, yuval.shaia@oracle.com, kamalheib1@gmail.com, philmd@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The flag is not recognized by some CLANG versions. Add proper constraints in code instead. Reviewed-by: Yuval Shaia Tested-by: Cornelia Huck Message-Id: <20190118124614.24548-2-marcel.apfelbaum@gmail.com> Signed-off-by: Marcel Apfelbaum --- contrib/rdmacm-mux/Makefile.objs | 2 +- contrib/rdmacm-mux/main.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/contrib/rdmacm-mux/Makefile.objs b/contrib/rdmacm-mux/Makefile.objs index be3eacb6f7..e1ff4fe569 100644 --- a/contrib/rdmacm-mux/Makefile.objs +++ b/contrib/rdmacm-mux/Makefile.objs @@ -1,4 +1,4 @@ ifdef CONFIG_PVRDMA -CFLAGS += -libumad -Wno-format-truncation +CFLAGS += -libumad rdmacm-mux-obj-y = main.o endif diff --git a/contrib/rdmacm-mux/main.c b/contrib/rdmacm-mux/main.c index 835a7f9214..64676030c5 100644 --- a/contrib/rdmacm-mux/main.c +++ b/contrib/rdmacm-mux/main.c @@ -42,6 +42,8 @@ /* The below can be override by command line parameter */ #define UNIX_SOCKET_PATH "/var/run/rdmacm-mux" +/* Has format %s-%s-%d" -- */ +#define SOCKET_PATH_MAX (PATH_MAX - NAME_MAX - sizeof(int) - 2) #define RDMA_PORT_NUM 1 typedef struct RdmaCmServerArgs { @@ -95,7 +97,7 @@ static void help(const char *progname) static void parse_args(int argc, char *argv[]) { int c; - char unix_socket_path[PATH_MAX]; + char unix_socket_path[SOCKET_PATH_MAX]; strcpy(server.args.rdma_dev_name, ""); strcpy(unix_socket_path, UNIX_SOCKET_PATH); @@ -113,7 +115,7 @@ static void parse_args(int argc, char *argv[]) case 's': /* This is temporary, final name will build below */ - strncpy(unix_socket_path, optarg, PATH_MAX); + strncpy(unix_socket_path, optarg, SOCKET_PATH_MAX); break; case 'p':