From patchwork Tue Aug 19 08:32:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 35560 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 52E2E2136C for ; Tue, 19 Aug 2014 08:39:55 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id r2sf28318244igi.8 for ; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=j3BJlWYvwLPdRCnCfRVEjz/WdhZEKYW2HtDGq1VEGQU=; b=A1eu9kl59C/UvOtFffIWt5vmng9+ta9bfQqssqprb2iSgqETkegHSGmZm2VB+DByFZ ie9CHRWPOGCrAh4t4CbEB/BpAulkd/AsuJTInsIdZYiHLNjNuTCJOPdmbHPv45FHHewa sUBZb9q/tGtdoZSpZ4C+oAWeTvjIol4VbPuO7im3q5ZP98tBUZtrURC89XUgyUIT9uTV bAyHw9mEAHYmvzfG6feGozno/hNsGNPl6elnN4uKK+3qN8gh/xtaC1kctzpyGgw6BgL5 KSDYUz9RZna5hv9xyRfD60fci3y2kfXppLCSEhyOaffRCOedcWpktsjM4sIhglZzgyY7 yMbA== X-Gm-Message-State: ALoCoQkt4S1MkKbE2vjiNHVYVMVdipF6VilhVL40oUEGw0Q99pThhuPkMqJfK9giaW2hRTCM8m2m X-Received: by 10.182.29.10 with SMTP id f10mr20801029obh.23.1408437594881; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.228 with SMTP id 91ls2505764qgr.70.gmail; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) X-Received: by 10.52.121.74 with SMTP id li10mr1506528vdb.19.1408437594777; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id k11si8354470vcy.20.2014.08.19.01.39.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Aug 2014 01:39:54 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id lf12so7099647vcb.29 for ; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) X-Received: by 10.52.52.136 with SMTP id t8mr22532843vdo.21.1408437594688; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp220574vcb; Tue, 19 Aug 2014 01:39:54 -0700 (PDT) X-Received: by 10.224.75.73 with SMTP id x9mr26866069qaj.63.1408437593875; Tue, 19 Aug 2014 01:39:53 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k3si26686927qay.45.2014.08.19.01.39.53 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 19 Aug 2014 01:39:53 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:49119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJexN-0003XY-HW for patch@linaro.org; Tue, 19 Aug 2014 04:39:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJeqs-00010u-M5 for qemu-devel@nongnu.org; Tue, 19 Aug 2014 04:33:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJeql-0001Ze-Hc for qemu-devel@nongnu.org; Tue, 19 Aug 2014 04:33:10 -0400 Received: from afflict.kos.to ([92.243.29.197]:35154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJeql-0001YY-Av for qemu-devel@nongnu.org; Tue, 19 Aug 2014 04:33:03 -0400 Received: from afflict.kos.to (afflict [92.243.29.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id F3D542661E; Tue, 19 Aug 2014 10:33:01 +0200 (CEST) From: riku.voipio@linaro.org To: Peter Maydell , qemu-devel@nongnu.org Date: Tue, 19 Aug 2014 11:32:47 +0300 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 92.243.29.197 Cc: Tom Musta Subject: [Qemu-devel] [PULL v2 12/23] linux-user: Properly Handle semun Structure In Cross-Endian Situations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Tom Musta The semun union used in the semctl system call contains both an int (val) and pointers. In cross-endian situations on 64 bit targets, the value passed to semctl is an 8 byte (abi_long) value and thus does not have the 4-byte val field in the correct location. In order to rectify this, the other half of the union must be accessed. This is achieved in code by performing a byte swap on the entire 8 byte union, followed by a 4-byte swap of the first half. Also, eliminate an extraneous (dead) line of code that sets target_su.val in the IPC_SET/IPC_GET case. Signed-off-by: Tom Musta Signed-off-by: Riku Voipio --- linux-user/syscall.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0113250..ba9dfc5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2652,9 +2652,18 @@ static inline abi_long do_semctl(int semid, int semnum, int cmd, switch( cmd ) { case GETVAL: case SETVAL: - arg.val = tswap32(target_su.val); + /* In 64 bit cross-endian situations, we will erroneously pick up + * the wrong half of the union for the "val" element. To rectify + * this, the entire 8-byte structure is byteswapped, followed by + * a swap of the 4 byte val field. In other cases, the data is + * already in proper host byte order. */ + if (sizeof(target_su.val) != (sizeof(target_su.buf))) { + target_su.buf = tswapal(target_su.buf); + arg.val = tswap32(target_su.val); + } else { + arg.val = target_su.val; + } ret = get_errno(semctl(semid, semnum, cmd, arg)); - target_su.val = tswap32(arg.val); break; case GETALL: case SETALL: