From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8762AC432BE for ; Mon, 30 Aug 2021 23:00:30 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF5026101B for ; Mon, 30 Aug 2021 23:00:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DF5026101B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=tls.msk.ru Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:34382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKqGS-0006gK-Ks for qemu-devel@archiver.kernel.org; Mon, 30 Aug 2021 19:00:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKqBC-0005aj-Ox; Mon, 30 Aug 2021 18:55:02 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:44153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKqBA-0000oq-UU; Mon, 30 Aug 2021 18:55:02 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 6527F40798; Tue, 31 Aug 2021 01:54:56 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id C8D7F7D; Tue, 31 Aug 2021 01:54:56 +0300 (MSK) Received: (nullmailer pid 1509769 invoked by uid 1000); Mon, 30 Aug 2021 22:54:56 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Subject: qemu-sockets: account for trailing \0 byte in unix socket pathname Date: Tue, 31 Aug 2021 01:54:49 +0300 Message-Id: <20210830225449.1509719-1-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Bug-Debian: http://bugs.debian.org/993145 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_NONE=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Tokarev , qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Linux kernel can return size of af_unix socket to be one byte larger than sockaddr_un structure - adding the trailing zero byte. Signed-off-by: Michael Tokarev Fixes: 4cfd970ec188558daa6214f26203fe553fb1e01f (first in 6.1.0) Cc: qemu-stable@nongnu.org diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index f2f3676d1f..83926dc2bc 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1345,8 +1345,9 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa, SocketAddress *addr; struct sockaddr_un *su = (struct sockaddr_un *)sa; + /* kernel might have added \0 terminator to non-abstract socket */ assert(salen >= sizeof(su->sun_family) + 1 && - salen <= sizeof(struct sockaddr_un)); + salen <= sizeof(struct sockaddr_un) + su->sun_path[0] ? 1 : 0); addr = g_new0(SocketAddress, 1); addr->type = SOCKET_ADDRESS_TYPE_UNIX;