From patchwork Wed Oct 16 20:09:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 835836 Delivered-To: patch@linaro.org Received: by 2002:a5d:6804:0:b0:37d:45d0:187 with SMTP id w4csp618472wru; Wed, 16 Oct 2024 13:12:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBoCCAfJ7SCK1lW1aZ6ucP7Pz9CPrcHNF/03XiQXS2hOvcGPXvC1AgD4uvxIycsy2xX6ArvA==@linaro.org X-Google-Smtp-Source: AGHT+IFGSXkM9ClrFc9IvrmjQpqbUl+6EOlg97e2fv9yrPTh/BAh1HbSGfix/xxh1Wyd7ikQ71nx X-Received: by 2002:a05:620a:4151:b0:7ac:b197:2361 with SMTP id af79cd13be357-7b121008a56mr2554640885a.47.1729109571217; Wed, 16 Oct 2024 13:12:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729109571; cv=none; d=google.com; s=arc-20240605; b=Egq3E56Ob1eLmYTz0PZbjlfXgn+4nbhTwI/ml9Hsv8X6nddEucqm2pjkPSy87W3GnF gdm0EKEyj6dBFClJ/VkTt48ZzhFYtUyDoy3PGRGvFZfczdoHmerz14mTr6TSxUyJF3L/ 3B3xYNShxA2ANCTIykPlKczH/LNjjhWFYpMPHjUyDqKhBK5amIMLBMmFcV0s5S4UFA+A om1cYLyRz24IGZMbKKQc4jORuUtQn1R3eb/fWOpBHAf5MpJ8RcvPOo6a9xvoCrQ5lQrV Jv3RlAKBWFEuHPXIOM0YHe6IUzLR5knpsbzdalKTiaEFYgnzuP3fSra/ISpq8l+jG18z Svqw== 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=BLRtFvXZ6MSz9tSJJBCQJWFbuwJINWOaCht8rBeIAm8=; fh=K4abbxCgZAPvqzOXA+PZ7RIZh+KufMVJze7rXLOwES0=; b=EJeOfodET2LkfKCm/dwfmPczpzSkc1a+4oX/+YbzBgfursk+ECWfm2ASDCTLTudNLi ozNFErg8IDVqrj2ktpJAvl/4fDoTq0PrWf7lDrgNDBCN5h1B9PP2aqxvFPio+vU5TgUz rzfRnAGEldkFrKGAYjHwjVRzKp7nuY26PyJKzsKo5JZvTS8eVnp5yC/6aUkyFFi6TkJQ 5JVJsBSZL4BXmjlTLoOodGZX95WolYvHWJBnHjsgKz0h3MzxtKn81W2ngUTwgNVtneTn P43iAAPS0Z3PW4g/q0vnmkFjbkUek6eC/fnXAjY2VY4zPNpWbgiUmTRNsaVHCcE+Jinu zG+Q==; 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-4607b0fa04bsi48531751cf.33.2024.10.16.13.12.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 16 Oct 2024 13:12:51 -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; 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 1t1AM0-0004lX-0y; Wed, 16 Oct 2024 16:10:44 -0400 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 1t1ALy-0004kj-NH; Wed, 16 Oct 2024 16:10:42 -0400 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 1t1ALw-0000fL-TV; Wed, 16 Oct 2024 16:10:42 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id BEB8198F94; Wed, 16 Oct 2024 23:10:05 +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 A4F52156374; Wed, 16 Oct 2024 23:10:25 +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-9.1.1 34/49] linux-user: Fix parse_elf_properties GNU0_MAGIC check Date: Wed, 16 Oct 2024 23:09:53 +0300 Message-Id: <20241016201025.256294-2-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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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 b27dd01734..0b1c230b1c 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -3136,11 +3136,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 @@ -3150,15 +3150,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;