From nobody Sat Nov 23 21:17:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 173115627290991.20972534458724; Sat, 9 Nov 2024 04:44:32 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9kU8-00068H-DW; Sat, 09 Nov 2024 07:22:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9kRm-0002sN-7D; Sat, 09 Nov 2024 07:20:15 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t9kRk-0005ly-7w; Sat, 09 Nov 2024 07:20:09 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id CAED8A165B; Sat, 9 Nov 2024 15:08:09 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 8FA4D167FE1; Sat, 9 Nov 2024 15:09:04 +0300 (MSK) Received: (nullmailer pid 3296280 invoked by uid 1000); Sat, 09 Nov 2024 12:09:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Sunil Nimmagadda , Konstantin Kostiuk , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Michael Tokarev Subject: [Stable-9.1.2 49/58] qemu-ga: Fix a SIGSEGV in ga_run_command() helper Date: Sat, 9 Nov 2024 15:08:50 +0300 Message-Id: <20241109120901.3295995-49-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1731156274575116600 From: Sunil Nimmagadda qemu-ga on a NetBSD -current VM terminates with a SIGSEGV upon receiving 'guest-set-time' command... Core was generated by `qemu-ga'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x000000000cd37a40 in ga_pipe_read_str (fd=3Dfd@entry=3D0xffffff922a20,= str=3Dstr@entry=3D0xffffff922a18) at ../qga/commands-posix.c:88 88 *str[len] =3D '\0'; [Current thread is 1 (process 1112)] (gdb) bt #0 0x000000000cd37a40 in ga_pipe_read_str (fd=3Dfd@entry=3D0xffffff922a20,= str=3Dstr@entry=3D0xffffff922a18) at ../qga/commands-posix.c:88 #1 0x000000000cd37b60 in ga_run_command (argv=3Dargv@entry=3D0xffffff922a9= 0, action=3Daction@entry=3D0xcda34b8 "set hardware clock to system time", = errp=3Derrp@entry=3D0xffffff922a70, in_str=3D0x0) at ../qga/commands-posix.c:164 #2 0x000000000cd380c4 in qmp_guest_set_time (has_time=3D, t= ime_ns=3D, errp=3Derrp@entry=3D0xffffff922ad0) at ../qga/commands-posix.c:304 #3 0x000000000cd253d8 in qmp_marshal_guest_set_time (args=3D, ret=3D, errp=3D0xffffff922b48) at qga/qga-qapi-commands.c:193 #4 0x000000000cd4e71c in qmp_dispatch (cmds=3Dcmds@entry=3D0xcdf5b18 , request=3Drequest@entry=3D0xf3c711a4b000, allow_oob=3Dallow_oob@entry=3Dfalse, cur_mon=3Dcur_mon@entry=3D0x0) at = ../qapi/qmp-dispatch.c:220 #5 0x000000000cd36524 in process_event (opaque=3D0xf3c711a79000, obj=3D0xf= 3c711a4b000, err=3D0x0) at ../qga/main.c:677 #6 0x000000000cd526f0 in json_message_process_token (lexer=3Dlexer@entry= =3D0xf3c711a79018, input=3D0xf3c712072480, type=3Dtype@entry=3DJSON_RCURLY, x=3D28, y=3D1) at ../qobject/json-stre= amer.c:99 #7 0x000000000cd93860 in json_lexer_feed_char (lexer=3Dlexer@entry=3D0xf3c= 711a79018, ch=3D125 '}', flush=3Dflush@entry=3Dfalse) at ../qobject/json-lexer.c:313 #8 0x000000000cd93a00 in json_lexer_feed (lexer=3Dlexer@entry=3D0xf3c711a7= 9018, buffer=3Dbuffer@entry=3D0xffffff922d10 "{\"execute\":\"guest-set-time\"= }\n", size=3D) at ../qobject/json-lexer.c:350 #9 0x000000000cd5290c in json_message_parser_feed (parser=3Dparser@entry= =3D0xf3c711a79000, buffer=3Dbuffer@entry=3D0xffffff922d10 "{\"execute\":\"guest-set-time\"= }\n", size=3D) at ../qobject/json-streamer.c:121 #10 0x000000000cd361fc in channel_event_cb (condition=3D, da= ta=3D0xf3c711a79000) at ../qga/main.c:703 #11 0x000000000cd3710c in ga_channel_client_event (channel=3D, condition=3D, data=3D0xf3c711b2d300) at ../qga/channel-posix.c:94 #12 0x0000f3c7120d9bec in g_main_dispatch () from /usr/pkg/lib/libglib-2.0.= so.0 #13 0x0000f3c7120dd25c in g_main_context_iterate_unlocked.constprop () from= /usr/pkg/lib/libglib-2.0.so.0 #14 0x0000f3c7120ddbf0 in g_main_loop_run () from /usr/pkg/lib/libglib-2.0.= so.0 #15 0x000000000cda00d8 in run_agent_once (s=3D0xf3c711a79000) at ../qga/mai= n.c:1522 #16 run_agent (s=3D0xf3c711a79000) at ../qga/main.c:1559 #17 main (argc=3D, argv=3D) at ../qga/main.c:= 1671 (gdb) The commandline options used on the host machine... qemu-system-aarch64 \ -machine type=3Dvirt,pflash0=3Drom \ -m 8G \ -cpu host \ -smp 8 \ -accel hvf \ -device virtio-net-pci,netdev=3Dunet \ -device virtio-blk-pci,drive=3Dhd \ -drive file=3Dnetbsd.qcow2,if=3Dnone,id=3Dhd \ -netdev user,id=3Dunet,hostfwd=3Dtcp::2223-:22 \ -object rng-random,filename=3D/dev/urandom,id=3Dviornd0 \ -device virtio-rng-pci,rng=3Dviornd0 \ -serial mon:stdio \ -display none \ -blockdev node-name=3Drom,driver=3Dfile,filename=3D/opt/homebrew/Cellar/= qemu/9.0.2/share/qemu/edk2-aarch64-code.fd,read-only=3Dtrue \ -chardev socket,path=3D/tmp/qga_netbsd.sock,server=3Don,wait=3Doff,id=3D= qga0 \ -device virtio-serial \ -device virtconsole,chardev=3Dqga0,name=3Dorg.qemu.guest_agent.0 This patch rectifies the operator precedence while assigning the NUL terminator. Fixes: c3f32c13a325f1ca9a0b08c19fefe9e5cc04289d Signed-off-by: Sunil Nimmagadda Reviewed-by: Konstantin Kostiuk Reviewed-by: Daniel P. Berrang=C3=A9 Link: https://lore.kernel.org/r/m15xppk9qg.fsf@nimmagadda.net Signed-off-by: Konstantin Kostiuk (cherry picked from commit 9cfe110d9fc0be88178770a85dc6170eecdf6be1) Signed-off-by: Michael Tokarev diff --git a/qga/commands-posix.c b/qga/commands-posix.c index c2bd0b4316..bb41fa9fa5 100644 --- a/qga/commands-posix.c +++ b/qga/commands-posix.c @@ -85,7 +85,7 @@ static ssize_t ga_pipe_read_str(int fd[2], char **str) *str =3D g_realloc(*str, len + n + 1); memcpy(*str + len, buf, n); len +=3D n; - *str[len] =3D '\0'; + (*str)[len] =3D '\0'; } close(fd[0]); fd[0] =3D -1; --=20 2.39.5