From patchwork Sat Jan 12 15:02:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 10760995 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7BD1591E for ; Sat, 12 Jan 2019 15:05:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B3C229263 for ; Sat, 12 Jan 2019 15:05:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EDDA29473; Sat, 12 Jan 2019 15:05:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0317D29263 for ; Sat, 12 Jan 2019 15:05:52 +0000 (UTC) Received: from localhost ([127.0.0.1]:55579 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giKrA-000557-AD for patchwork-qemu-devel@patchwork.kernel.org; Sat, 12 Jan 2019 10:05:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1giKo2-0003n8-8W for qemu-devel@nongnu.org; Sat, 12 Jan 2019 10:02:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1giKo1-0002sf-Bh for qemu-devel@nongnu.org; Sat, 12 Jan 2019 10:02:38 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:33321) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1giKo1-0002p0-5A; Sat, 12 Jan 2019 10:02:37 -0500 Received: by mail-wr1-x442.google.com with SMTP id c14so18313012wrr.0; Sat, 12 Jan 2019 07:02:30 -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=F4/hTzT7WrOHkWFiv7iSm1u2YS+rDnkYiaRHoaHz5Qw=; b=HFLYlzel63LLCUCNQ5NDUcrZ1Y993O8XJ/ct81RqQ9V/ZRMQtluqtNann8bU8aSTkp Tb7gUw3T7vGaJHKn9xTNO5pm/wXfHQQEf0MK2FY8cP6tGEhrJ5QxvG58SYBZdVzwubQS K2TpEYA1n4MmnWc377IZXVzI25Te2mNEJBjUU6zZc7fzaFcxZQymh2NqTCGoonw6Ktss QUhAtoXbvK6a2fbuxP9xKxGBcJQO9QItEFAmbSLxY6IeWVE3uok2quqn5wMoNEWA7vZ6 8TMBRUmauA/ZMBXhwV8GNkuPC0ZOEywBp90vnD8Hzl6y5eKENOR3YKmflf/Xb5VaSk9H GW+Q== 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=F4/hTzT7WrOHkWFiv7iSm1u2YS+rDnkYiaRHoaHz5Qw=; b=PRg/G5BkSkawQ4LYrrPTnoyjpsw+uq5BwlWDd/ngEt0eaXJncvtuRYMAjMxBGD39XD 5fuxZyXPzjtRZP7cUpjSP1Yv7p+lOiC3LNjKFELiJmzs6jBZnpf0QamtkVwWsCoP1C0a e2YKfbnpBXQ+Q/NJ9ZT0aZ139Kx7/zkODfL4nJ6mOKDcGRh0LsO6RSjnOpQ/0L3BDNmR 28RMXwJrrnRyO1RTcPF8Zi4N7sjDuRIqCC3UQyP+xLBtyD56QF37eLbPsLgcDFkYjWVT 66zEes0jK1Yn7Thv+niyRSlOOCJlKiypJxdCyId1bPNSyoabSJWbViYueAzWOarJ/sub Kj5Q== X-Gm-Message-State: AJcUukfbSpe+FkXLdlzz8nlssSLldEQz5zqbDyDJWnjTlw+GCaulzZ97 eHfERmXfHAHc5+WIVl6omFdSFhEK X-Google-Smtp-Source: ALg8bN56MypAPprurblBApgIj4S/Dk4MrfwybkKSnqCcR4TOtgTduBFpOFuZ/Xi4YD1fbrRtQpFTww== X-Received: by 2002:adf:9c8a:: with SMTP id d10mr16982133wre.244.1547305349345; Sat, 12 Jan 2019 07:02:29 -0800 (PST) Received: from localhost.localdomain ([176.228.155.165]) by smtp.gmail.com with ESMTPSA id o81sm38222581wmd.10.2019.01.12.07.02.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 12 Jan 2019 07:02:28 -0800 (PST) From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Sat, 12 Jan 2019 17:02:23 +0200 Message-Id: <20190112150225.20294-2-marcel.apfelbaum@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190112150225.20294-1-marcel.apfelbaum@gmail.com> References: <20190112150225.20294-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 1/3] 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, qemu-stable@nongnu.org, yuval.shaia@oracle.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The flag is not recognized by some CLANG versions. Add proper constraints in code instead. Signed-off-by: Marcel Apfelbaum Reviewed-by: Yuval Shaia --- 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':