From patchwork Tue Nov 1 12:25:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 689849 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3t7VnQ3wX8z9sR9; Tue, 1 Nov 2016 23:25:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b=eAfgU24Z; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1c1Y8M-0004xh-LT; Tue, 01 Nov 2016 12:25:42 +0000 Received: from mail-oi0-f41.google.com ([209.85.218.41]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1c1Y8I-0004wT-0o for kernel-team@lists.ubuntu.com; Tue, 01 Nov 2016 12:25:38 +0000 Received: by mail-oi0-f41.google.com with SMTP id 62so173691349oif.1 for ; Tue, 01 Nov 2016 05:25:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=eSnkiGg7sI3SJHCoSUZ2G2I5uhLcCkQvJ72I/+/wnQQ=; b=eAfgU24ZmfFtKbNzMuHC2+fHfSoHnM0qCICn4IIHHEHmeTrpAAhHcOF3BaR1kyRXlh A/e4FbPqjG1adF3baTBWN4peXV89gW/X69ovkEtNoMToAg+aAuUqqL7SbuAB6J9luZNv XyiiHgYuBvarbjdmruMZcednR6YCsCRiSkTKvX5zcfhmMjkQOOKZ0DT85EcRGW4SsKMG iqp1Sagd0aLbaFt7S58j78pFSOboYmWvg1+SJ/JR4R9YNMbAr7DUCiFZ8gliDBGiynzE ibd/Jl76adtvgjwKtDPpM9ABh+4SZGic4hArIapbPjyzY/jEZv17Ohl9BtG8hV+8gxDx dbGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=eSnkiGg7sI3SJHCoSUZ2G2I5uhLcCkQvJ72I/+/wnQQ=; b=JbQAAtNAHPcYCzRnzDZlqIHGkw4UkwClwx00pA79AgDzAnBbCgTO2U59UtyfF8pCBQ vlsUoEZaZ9POw7UrA6nBxjTS05tfhZkJtKKCCatxeuBOsDedT/q8ULsp3YpUGxCi10nB Xks8JDyLq8JocF8UDAdoKgYZ+Va2AbDkKNztsmbNxgk7N9Yc+R8o0nnYRsA7LGX36FSI gXNrPcPIx+p8khcrJCtSOWdVwS4c0ba2Pjf3sA6vdiNJ6kOYPVRZNDfkKdpYSBgtiXG+ iIPbdmhIEpeGOsWvJKQSa/eSPKkTC+tUlM8qiHTNMuCqHR3SK8F1OGGNnt/PuREPrIn8 38Lw== X-Gm-Message-State: ABUngvdRL7dmoa4hU8figBzK5h66yzUfVwJBEHiNdw/HEbP8nW2KID98DvtW35BHyhYFURkZ X-Received: by 10.107.3.83 with SMTP id 80mr13735107iod.52.1478003136761; Tue, 01 Nov 2016 05:25:36 -0700 (PDT) Received: from localhost.localdomain (96-92-69-241-static.hfc.comcastbusiness.net. [96.92.69.241]) by smtp.gmail.com with ESMTPSA id 70sm12411160iou.3.2016.11.01.05.25.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Nov 2016 05:25:36 -0700 (PDT) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3] Revert "fix minor infoleak in get_user_ex()" Date: Tue, 1 Nov 2016 06:25:15 -0600 Message-Id: <1478003116-28333-3-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478003116-28333-1-git-send-email-tim.gardner@canonical.com> References: <1478003116-28333-1-git-send-email-tim.gardner@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Greg Kroah-Hartman BugLink: http://bugs.launchpad.net/bugs/1638272 This reverts commit 9d25c78ec01c402dc56272693c44ef9d72ecdd2e which is 1c109fabbd51863475cd12ac206bdd249aee35af upstream Cc: Al Viro Cc: Linus Torvalds Signed-off-by: Greg Kroah-Hartman Signed-off-by: Tim Gardner --- arch/x86/include/asm/uaccess.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index d42252c..09b1b0a 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -394,11 +394,7 @@ do { \ #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ asm volatile("1: mov"itype" %1,%"rtype"0\n" \ "2:\n" \ - ".section .fixup,\"ax\"\n" \ - "3:xor"itype" %"rtype"0,%"rtype"0\n" \ - " jmp 2b\n" \ - ".previous\n" \ - _ASM_EXTABLE_EX(1b, 3b) \ + _ASM_EXTABLE_EX(1b, 2b) \ : ltype(x) : "m" (__m(addr))) #define __put_user_nocheck(x, ptr, size) \