From patchwork Sat Nov 9 10:14:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 842071 Delivered-To: patch@linaro.org Received: by 2002:a5d:6307:0:b0:381:e71e:8f7b with SMTP id i7csp2081468wru; Sat, 9 Nov 2024 02:16:26 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWkPHXglI4YRe/aPcUMzr+yL4vjmEEwttw945dAiJVYZtqrmKi7dywv2SwdhTgrgVax90f97A==@linaro.org X-Google-Smtp-Source: AGHT+IE/0gkQccNOg1lbufXQGVRKcmq0MTrbpAbqlfFxxsYFESl+5d/ZqrB6l0aVnhBe0S4KPqA6 X-Received: by 2002:a05:622a:1907:b0:462:fef1:e1f5 with SMTP id d75a77b69052e-4630935bfcamr83550011cf.26.1731147385923; Sat, 09 Nov 2024 02:16:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1731147385; cv=none; d=google.com; s=arc-20240605; b=I6S+92FP+HD7LrFmGs7xMaQ9XlfAod/I5uKDN6TFHQYzgioEqgKo1ugO1y4YgQRVM5 iyc6UlctSuJzjfmi9eg+EQulU0yDF02p2QHOtYNY/QQ0ETErqLd+5ToLOi4hXQTX//3h McJcWyOBbK9Y30E35xXh2zp8GU3VVoFxadeweMzvryF2/Cq3/zaiyRGBedb5ZqWMsbdn jsK0ULGjrEvXfgmHNG/Sxyhv4hpmh9L15Kc8pxP4db9yJALjhJnVuSJnp0XKvwJACAPw xzAguc/exHnNhqTIgRYDODe0Rsq+h7/Kx1kGBwUgH1z40Pl6D0tkK2pofWQA/aGSI9oT ngKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:cc:to :from; bh=gNemSjruXi27ZWNxxU07nsaBN+EDru+D07mxZIgfjoE=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=LvZJ+u1g0MtRSMfIkynt3517fYUom+FWlGenhU9PwwNyc5NHEwSr7NH4hq4LpyO53i zUoN60095Ne61ZmSAxIRQDJxvrhFCOzssyeKjraJhXeMEjPYbi6PtbEGzc3vkW9pJT/l bHyNvDZ2zhCrgX0EdW/1tBsMG6iZfguthe2QaiYTkBWEkczfdqYXNRWjCfUDST2vYAQX yl67g3xFkFoUy/AoBL/A+r2gQT9HxaeQIra3PNZ8DAsRO2i5IsHEbEHW8WqAaNiI2qvq z/xrt5GyAALJ6qbklt5t33YJatbC+hjjvuYgZ1D0i8vO3TCY2i1RmaLdKWXsxPvaTFu8 yonw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-462ff62630csi63997041cf.497.2024.11.09.02.16.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 09 Nov 2024 02:16:25 -0800 (PST) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t9iVg-0005Ma-T9; Sat, 09 Nov 2024 05:16:05 -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 1t9iUk-00048D-86; Sat, 09 Nov 2024 05:15:06 -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 1t9iUg-0007YM-Vf; Sat, 09 Nov 2024 05:15:05 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9674EA13EE; Sat, 9 Nov 2024 13:13:49 +0300 (MSK) Received: from think4mjt.tls.msk.ru (mjtthink.wg.tls.msk.ru [192.168.177.146]) by tsrv.corpit.ru (Postfix) with ESMTP id 432D0167EDA; Sat, 9 Nov 2024 13:14:44 +0300 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Michael Tokarev Subject: [Stable-8.2.8 10/49] linux-user: Fix parse_elf_properties GNU0_MAGIC check Date: Sat, 9 Nov 2024 13:14:01 +0300 Message-Id: <20241109101443.312701-10-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.5 In-Reply-To: References: MIME-Version: 1.0 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Comparing a string of 4 bytes only works in little-endian. Adjust bulk bswap to only apply to the note payload. Perform swapping of the note header manually; the magic is defined so that it does not need a runtime swap. Fixes: 83f990eb5adb ("linux-user/elfload: Parse NT_GNU_PROPERTY_TYPE_0 notes") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2596 Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev (cherry picked from commit 2884596f5f385b5712c356310dd4125a089888a8) Signed-off-by: Michael Tokarev diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 7cc8d9685e..d11842cb94 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3203,11 +3203,11 @@ static bool parse_elf_properties(const ImageSource *src, } /* - * The contents of a valid PT_GNU_PROPERTY is a sequence - * of uint32_t -- swap them all now. + * The contents of a valid PT_GNU_PROPERTY is a sequence of uint32_t. + * Swap most of them now, beyond the header and namesz. */ #ifdef BSWAP_NEEDED - for (int i = 0; i < n / 4; i++) { + for (int i = 4; i < n / 4; i++) { bswap32s(note.data + i); } #endif @@ -3217,15 +3217,15 @@ static bool parse_elf_properties(const ImageSource *src, * immediately follows nhdr and is thus at the 4th word. Further, all * of the inputs to the kernel's round_up are multiples of 4. */ - if (note.nhdr.n_type != NT_GNU_PROPERTY_TYPE_0 || - note.nhdr.n_namesz != NOTE_NAME_SZ || + if (tswap32(note.nhdr.n_type) != NT_GNU_PROPERTY_TYPE_0 || + tswap32(note.nhdr.n_namesz) != NOTE_NAME_SZ || note.data[3] != GNU0_MAGIC) { error_setg(errp, "Invalid note in PT_GNU_PROPERTY"); return false; } off = sizeof(note.nhdr) + NOTE_NAME_SZ; - datasz = note.nhdr.n_descsz + off; + datasz = tswap32(note.nhdr.n_descsz) + off; if (datasz > n) { error_setg(errp, "Invalid note size in PT_GNU_PROPERTY"); return false;