From patchwork Wed Apr 18 14:48:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 900177 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40R4n11Vj1z9s4n; Thu, 19 Apr 2018 00:51:01 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1f8oQA-00023H-4U; Wed, 18 Apr 2018 14:50:54 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1f8oQ7-00022y-Gs for kernel-team@lists.ubuntu.com; Wed, 18 Apr 2018 14:50:51 +0000 Received: from mail-it0-f70.google.com ([209.85.214.70]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1f8oQ7-0006py-5l for kernel-team@lists.ubuntu.com; Wed, 18 Apr 2018 14:50:51 +0000 Received: by mail-it0-f70.google.com with SMTP id t126-v6so2043327itc.1 for ; Wed, 18 Apr 2018 07:50:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=7HWhVhrcCVW5/Sfdo6CAGAJJtvkry+EdEemjdUFIcIQ=; b=IyEuDIqrtJTZfhuQtkYxujTcP/ivsqUWha2sxwTy47gOJvYmI8/W8x8YtxrCzo9aPP JlGt7GdrDQcOAF0K1f613ZFaayFlSkscXMQYD8gr4vT9UTo2qwhe8biX8iyJpLcZbPZX S7hQlrHFDuvU2VCCCEeEZSkdqAnrHuubnCQsJvOOkXTpI1OxqARnor9T9DFNstfHhimQ OCUi7D8W3jg7nY3lgCkKYXQoZxsdqUhC/Jdh2pdlEJ9qUX2G91w566ptXUu6JHWZrI6u Y4vwjg2z6StHewioYePc/FpLdvKor+1jPqECdokZmrICSTCvY/new7A5xkIpO2TxWTx2 1/Sw== X-Gm-Message-State: ALQs6tASTNz3X42fh2u2z3vj1+uTcox13LSj1fhluLgvG13OotrlE/Ki ikt305Vj6ShHrW9H+9SSbdk7Ify3bl5UdwsTsVg5gD2YhQscxu/rW6Z6s8h7qlauWeAA3VxC4vE k5/O6OKtvdgl3gNUgmVmHn2X1tMcBG572q4qFF5Xv3A== X-Received: by 2002:a6b:8ad6:: with SMTP id c83-v6mr2258696ioj.280.1524063049879; Wed, 18 Apr 2018 07:50:49 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/O+Ot4hhajmknO6/rwr+hsoKU/m0HRErVuWhcG5yLDUkcPzQMYY7K55ul5LLY2m8FW4rsyfw== X-Received: by 2002:a6b:8ad6:: with SMTP id c83-v6mr2258684ioj.280.1524063049608; Wed, 18 Apr 2018 07:50:49 -0700 (PDT) Received: from localhost ([136.63.232.127]) by smtp.gmail.com with ESMTPSA id m71-v6sm927928itc.5.2018.04.18.07.50.48 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Apr 2018 07:50:48 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [SRU][Bionic][PATCH] s390/compat: fix setup_frame32 Date: Wed, 18 Apr 2018 09:48:38 -0500 Message-Id: <20180418144838.19531-1-seth.forshee@canonical.com> X-Mailer: git-send-email 2.15.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" From: Heiko Carstens http://bugs.launchpad.net/bugs/1765083 Git commit c60a03fee0e5 ("s390: switch to {get,put}_compat_sigset()") contains a typo and now copies the wrong pointer to user space. Use the correct pointer instead. Reported-and-tested-by: Stefan Liebler Fixes: c60a03fee0e5 ("s390: switch to {get,put}_compat_sigset()") Cc: # v4.15+ Cc: Al Viro Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky (cherry picked from commit 8b09ca746a643ca452cd41a522046a96ee5a55fd) Signed-off-by: Seth Forshee Acked-by: Colin Ian King Acked-by: Thadeu Lima de Souza Cascardo --- arch/s390/kernel/compat_signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c index ef246940b44c..f19e90856e49 100644 --- a/arch/s390/kernel/compat_signal.c +++ b/arch/s390/kernel/compat_signal.c @@ -379,7 +379,7 @@ static int setup_frame32(struct ksignal *ksig, sigset_t *set, if (put_compat_sigset((compat_sigset_t __user *)frame->sc.oldmask, set, sizeof(compat_sigset_t))) return -EFAULT; - if (__put_user(ptr_to_compat(&frame->sc), &frame->sc.sregs)) + if (__put_user(ptr_to_compat(&frame->sregs), &frame->sc.sregs)) return -EFAULT; /* Store registers needed to create the signal frame */