From patchwork Thu Sep 22 16:35:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 608259 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp511633pvb; Thu, 22 Sep 2022 11:49:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4USFyd+IGFAc4uW0uxBkJ/Yyt1DTK9H2AcJzfdwTnRejLbetJ3t3JotaGDQzJB35G6ULIH X-Received: by 2002:ac8:5881:0:b0:35b:b25b:6fd5 with SMTP id t1-20020ac85881000000b0035bb25b6fd5mr4141478qta.169.1663872585405; Thu, 22 Sep 2022 11:49:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663872585; cv=none; d=google.com; s=arc-20160816; b=W7SorhSuNZV9PyCeaFN4TJE4J+N/syTzGbsaF4cbMQi36y4IML2U57mawe+OJJ1wlT 2dGShpWCwQmYDHnoQp0zdBNLPUMRv8MCHuGpyomugCr7XLpI5DRbbtlWHa+kA1IhLYDF 42FM3gpohfGJdEhaPdA/Rmb4Ax8TsvK36/V8l0lygHJvCSFRT+WAmWrXoXPNR8g1ykvS c4MFQlFr4OmSjtL6OGmF+cZ1tJHwQ9U1QmQ3jj/ACctX7DMb5QdPevtFcApyndsySLEI vkPygpdulQ49tUQ+2ZH2zPRSZCfTOCgn0adKvaU98EGYbl7nw/tQnz44Y4YTwDKlDQg6 snRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=qX86iXQWy4diJSSYD9PIr2CHjWMIxQY9Dao4svxApxw=; b=GbPlIk+udfNpVgKJAC24lI10Z+iz9K+EXPB/KgHuyNHkgUDh+iwVTXylGB8RoxQp6D L+kaAESVzNvS1Rckc1UAMnmRt/krdSCg/NaRb5pI6Njo9c4k4muXOuYjm757rCIFjOWY xRGpRm5HRbNYexnGOD5U3Ec/uIF0K03shYNCobpcBsHWztNebJ4o9cCx6i8q93LqJAYA j/XZ//vqVNoTaPrkxesfLFfK3ySgh2bh7lojAd8l8yZ2rX0oabcWUGrPcOxA/sm1ffKu 6HYmAA64Qy8VS/SWBOPuDnxdvERSdgBlcwsH9dcOaAkQfkuYZwXNT0SlBBLCIKJK/52z M5Ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Yv6LuHE6; 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=pass (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 jn2-20020ad45de2000000b004ad2895d485si3382128qvb.384.2022.09.22.11.49.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Sep 2022 11:49:45 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=Yv6LuHE6; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obRGY-0003mo-UX for patch@linaro.org; Thu, 22 Sep 2022 14:49:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obPBA-0002CI-DS for qemu-devel@nongnu.org; Thu, 22 Sep 2022 12:36:10 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:37714) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obPB8-0005Ri-DS for qemu-devel@nongnu.org; Thu, 22 Sep 2022 12:35:59 -0400 Received: by mail-wm1-x32d.google.com with SMTP id z13-20020a7bc7cd000000b003b5054c6f9bso1181426wmk.2 for ; Thu, 22 Sep 2022 09:35:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=qX86iXQWy4diJSSYD9PIr2CHjWMIxQY9Dao4svxApxw=; b=Yv6LuHE6V79ZfzLRyigT5YQlR86s3F7vRTGb1rN/+oCXugUM2wCOUpLICCmU8mrabT whwmkR0F96Rc7VMkTiApsKnUQco5vc/q+ud1hPrSYCpSw/jwt14eDjLuq4zP08J41xx1 tZrGqKxZD9Jpz1QK01Dexr+IWGS28YqtuP3NMvFt3wzzGfVC0GIPamqvpWPt1lsVkrcQ YxG3wXhvMR7pmFCXMJx3prTk6pu0dOEiYbfwND3ywDwWLWoK+0+45w4yI2bB+q9rhvTg R5HrrwmUFfEs6QchNLm1irqulY23lviN1fS10xX+PRMVAoc6konKp5VwWnY6o4a/a94K nq4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=qX86iXQWy4diJSSYD9PIr2CHjWMIxQY9Dao4svxApxw=; b=KcY/FhQ6fS/t4xLrGZz7RhO8gUoahpzMdrKeUQtpHCBUwiHUOYMSZCtUADyLrLHFEd rw8TTtHTdSAM9u35UmXss2sNQy8TbH3wp2KOypa+cQNDAe2LEmK87b0KdbfdNL8at3Yp /h9P2FSv0Dhv48RtHt5pIm640reLNSO/XmY0NH3HGghkfpG0THdTIGhZ8KH2Zns2UwFo ZKaGtXM2BeWAMoPoxthIyWjHtCqSx+IUYLv3vMn0NyamwnmiBTxbE6Gz2hiupjPIryV1 GJ4a1aiJlnzhuJIM5xAqfK6Ni8kQYvI/GejDKv1zDT/AtUSq1mrt+EkZpjotJUo5iQr9 jzxg== X-Gm-Message-State: ACrzQf2XLzmVAIRseMmRbveF1QDjVxNN6liZgNX5Qz0NUxNZuVu6qDW3 vNMeTgoginxG3py/6iFB/b8WZp7xIfGpWA== X-Received: by 2002:a05:600c:3ba0:b0:3b4:8ad0:6c with SMTP id n32-20020a05600c3ba000b003b48ad0006cmr9998060wms.186.1663864554831; Thu, 22 Sep 2022 09:35:54 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id iw1-20020a05600c54c100b003b3401f1e24sm6452599wmb.28.2022.09.22.09.35.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 09:35:54 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/39] io/channel-websock: Replace strlen(const_str) by sizeof(const_str) - 1 Date: Thu, 22 Sep 2022 17:35:22 +0100 Message-Id: <20220922163536.1096175-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922163536.1096175-1-peter.maydell@linaro.org> References: <20220922163536.1096175-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.google.com 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé The combined_key[... QIO_CHANNEL_WEBSOCK_GUID_LEN ...] array in qio_channel_websock_handshake_send_res_ok() expands to a call to strlen(QIO_CHANNEL_WEBSOCK_GUID), and the compiler doesn't realize the string is const, so consider combined_key[] being a variable-length array. To remove the variable-length array, we provide it a hint to the compiler by using sizeof() - 1 instead of strlen(). Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Signed-off-by: Peter Maydell Message-id: 20220819153931.3147384-5-peter.maydell@linaro.org --- io/channel-websock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io/channel-websock.c b/io/channel-websock.c index 9619906ac36..fb4932ade70 100644 --- a/io/channel-websock.c +++ b/io/channel-websock.c @@ -32,7 +32,7 @@ #define QIO_CHANNEL_WEBSOCK_CLIENT_KEY_LEN 24 #define QIO_CHANNEL_WEBSOCK_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" -#define QIO_CHANNEL_WEBSOCK_GUID_LEN strlen(QIO_CHANNEL_WEBSOCK_GUID) +#define QIO_CHANNEL_WEBSOCK_GUID_LEN (sizeof(QIO_CHANNEL_WEBSOCK_GUID) - 1) #define QIO_CHANNEL_WEBSOCK_HEADER_PROTOCOL "sec-websocket-protocol" #define QIO_CHANNEL_WEBSOCK_HEADER_VERSION "sec-websocket-version"