Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3487916imu; Sun, 11 Nov 2018 16:13:24 -0800 (PST) X-Google-Smtp-Source: AJdET5fIRmF/2folOqPAAoHcU2hyWxnB/V5XVvE3Fzk3gbIS0Gc65eun/oeM989r/wkJp/EF46O7 X-Received: by 2002:a62:1693:: with SMTP id 141-v6mr18536311pfw.183.1541981604778; Sun, 11 Nov 2018 16:13:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541981604; cv=none; d=google.com; s=arc-20160816; b=PLkXa0HVeNzwS4DUr2n+6nVwLaJ3bn2dY00ulrRaLcsuIXa8RKTUQM8SYaIFXuIMJA uF7lBAG9cdTL1janKTtnvAqPc3Wu33mHIjwgiGfwR99AvF42m2mjiKTBvsx/Q8QrwmXE 43/rzQV7kzZ2GlNEs3+J1DCuwe0i+OadS+pcg86nwGzRTZAhkdlITWPafOp46XY/hS5N 5pTKRp4zcplDvNN/AxTdH3toS7nUivZ/+t1oDXQU+qfWq5jnM+TPMtF9EK7IEkLn35/D NTYHz/6WZlfbiQKSBdOQII+zILy4m77c8xloTWW6tq5fLkfpFIRGZM4Pw9PMrnWCoF91 g8Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Y1IABdRNKDHHUCW2UxwVy+vWbblDF9Xyztb/Wliazic=; b=fX3HKwsAMZuzT3I9+ftrlzcLOSXx1Z+NfEssHFdpNOf7Whrw8Ic2QJ0uHPMOtPl6dv GR5PMpfEzefqM3bsx4YYKPeK6cq8kfBwEs3EPGSXD1cFHjPf4Rb+l4PFIERZyRQLuHl4 s6kOXoXBOatv1RolPTPuHy9l6QdDu8lqWZKaRcCEffRC65KnYJe8BFrWPCQK5Y/RIwJP 37ZdDs89XQ898i3+B1+6rBlC7B93g9PXlXlS67aZ0TS39U7c4F9hXwQFl3fjUxWMaZgz KrTSoKnqLuFrVImIBDuR6PCLJhdybnnfVXM2etzeVUXDuzMEXuKjWDQN6897dlIfWQ74 tcrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ElbIAPSj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 10-v6si13704525pgo.486.2018.11.11.16.13.09; Sun, 11 Nov 2018 16:13:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=ElbIAPSj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730748AbeKLKDR (ORCPT + 99 others); Mon, 12 Nov 2018 05:03:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:60196 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730559AbeKLIRR (ORCPT ); Mon, 12 Nov 2018 03:17:17 -0500 Received: from localhost (unknown [206.108.79.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF0DA214F1; Sun, 11 Nov 2018 22:27:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541975241; bh=0OhGz4qhAHAYNCMzQHEX8+88VazVbE9X0UUFJHK76gQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ElbIAPSjcIxoTsZz5WYnEFJuNQChvFNE+OoxqdecNi7KgJFGp8IyRO+3X4N989saM FIx9gHVyLj3bd4Nz43I2hbc/Ne47emrhga59WPEPSETlKzQjJwCYyYOXvo7tSntJnN zch2wCzoTrTZL9q+3w3LuHoIG0get/UDuQyVhrr8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , Dominik Brodowski , "Eric W. Biederman" , Andrew Morton , Al Viro , Oleg Nesterov , Steve McIntyre , Steve McIntyre <93sam@debian.org>, Will Deacon , Catalin Marinas , Sasha Levin Subject: [PATCH 4.19 087/361] signal: Introduce COMPAT_SIGMINSTKSZ for use in compat_sys_sigaltstack Date: Sun, 11 Nov 2018 14:17:14 -0800 Message-Id: <20181111221632.025807083@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111221619.915519183@linuxfoundation.org> References: <20181111221619.915519183@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Will Deacon [ Upstream commit 22839869f21ab3850fbbac9b425ccc4c0023926f ] The sigaltstack(2) system call fails with -ENOMEM if the new alternative signal stack is found to be smaller than SIGMINSTKSZ. On architectures such as arm64, where the native value for SIGMINSTKSZ is larger than the compat value, this can result in an unexpected error being reported to a compat task. See, for example: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=904385 This patch fixes the problem by extending do_sigaltstack to take the minimum signal stack size as an additional parameter, allowing the native and compat system call entry code to pass in their respective values. COMPAT_SIGMINSTKSZ is just defined as SIGMINSTKSZ if it has not been defined by the architecture. Cc: Arnd Bergmann Cc: Dominik Brodowski Cc: "Eric W. Biederman" Cc: Andrew Morton Cc: Al Viro Cc: Oleg Nesterov Reported-by: Steve McIntyre Tested-by: Steve McIntyre <93sam@debian.org> Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- include/linux/compat.h | 3 +++ kernel/signal.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -103,6 +103,9 @@ typedef struct compat_sigaltstack { compat_size_t ss_size; } compat_stack_t; #endif +#ifndef COMPAT_MINSIGSTKSZ +#define COMPAT_MINSIGSTKSZ MINSIGSTKSZ +#endif #define compat_jiffies_to_clock_t(x) \ (((unsigned long)(x) * COMPAT_USER_HZ) / HZ) --- a/kernel/signal.c +++ b/kernel/signal.c @@ -3460,7 +3460,8 @@ int do_sigaction(int sig, struct k_sigac } static int -do_sigaltstack (const stack_t *ss, stack_t *oss, unsigned long sp) +do_sigaltstack (const stack_t *ss, stack_t *oss, unsigned long sp, + size_t min_ss_size) { struct task_struct *t = current; @@ -3490,7 +3491,7 @@ do_sigaltstack (const stack_t *ss, stack ss_size = 0; ss_sp = NULL; } else { - if (unlikely(ss_size < MINSIGSTKSZ)) + if (unlikely(ss_size < min_ss_size)) return -ENOMEM; } @@ -3508,7 +3509,8 @@ SYSCALL_DEFINE2(sigaltstack,const stack_ if (uss && copy_from_user(&new, uss, sizeof(stack_t))) return -EFAULT; err = do_sigaltstack(uss ? &new : NULL, uoss ? &old : NULL, - current_user_stack_pointer()); + current_user_stack_pointer(), + MINSIGSTKSZ); if (!err && uoss && copy_to_user(uoss, &old, sizeof(stack_t))) err = -EFAULT; return err; @@ -3519,7 +3521,8 @@ int restore_altstack(const stack_t __use stack_t new; if (copy_from_user(&new, uss, sizeof(stack_t))) return -EFAULT; - (void)do_sigaltstack(&new, NULL, current_user_stack_pointer()); + (void)do_sigaltstack(&new, NULL, current_user_stack_pointer(), + MINSIGSTKSZ); /* squash all but EFAULT for now */ return 0; } @@ -3553,7 +3556,8 @@ static int do_compat_sigaltstack(const c uss.ss_size = uss32.ss_size; } ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, - compat_user_stack_pointer()); + compat_user_stack_pointer(), + COMPAT_MINSIGSTKSZ); if (ret >= 0 && uoss_ptr) { compat_stack_t old; memset(&old, 0, sizeof(old));