From patchwork Thu Jan 11 02:02:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 10156601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EB0B3605BA for ; Thu, 11 Jan 2018 02:13:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D777C2874B for ; Thu, 11 Jan 2018 02:13:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC32A2874E; Thu, 11 Jan 2018 02:13:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,URIBL_BLACK autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4CA7F2874B for ; Thu, 11 Jan 2018 02:13:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754329AbeAKCNA (ORCPT ); Wed, 10 Jan 2018 21:13:00 -0500 Received: from mail-pg0-f67.google.com ([74.125.83.67]:40379 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754293AbeAKCJo (ORCPT ); Wed, 10 Jan 2018 21:09:44 -0500 Received: by mail-pg0-f67.google.com with SMTP id q12so1627163pgt.7 for ; Wed, 10 Jan 2018 18:09:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=DEx66seWax9cOAUQfqNGAdG59u+63cMY7cENNNmbTLc=; b=OIFSzACzaj6Dsau1eKwHM5e0hMhjAWMg4la+8Hhh+Ln0+QvAg/gf8KSaK3d9Y1+01K w/EFP2F3gKrOTdrjBkwlOjjvVFuA00VIe5+PR0dXAb9zJ0Lx9ZzVPqgCim/0SPo8cySR SoCMN7JwM6AtiZJkbLJBTvIVm3eyI8nWxCWKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=DEx66seWax9cOAUQfqNGAdG59u+63cMY7cENNNmbTLc=; b=mR3ta6Xcjb2YsEPCcZuloYZlDADd02ugr1F2YBQCxP5RgpdmMgVKgdcqZDMSwF9BhT H/mndtBmI1OajFy1lVkVstOQq9Zo18Ax1UAp7x2fXsSMKLwnJ10Mp4Xq9rt0soXOmrdH RhxQcuD+jeHbFV6M+5yghgu/B++dQlF+h7livUw7ckDQAU77h4CQeY2BlnJfC8OhdLnv Dw+Ss98MVRRmtPsPmAwkWzaDlnvI+L4RHgu8mQG6BsKNYFMsIdDsyCFrAGqTu9Uo4QOA q4TcTOIb1HGxb1Kkvb6vRx9kXS92SBY3vL0x0Zx3V1Ov7TTDQ/LzO9036MDc65MWofkI N6/A== X-Gm-Message-State: AKGB3mIo+N/gtLhpCOec3ofhnHcvyVJYxSMxmaOFt/rGIXVgY0Um9Y59 5NSdQ85sAHn0I2kxPQ4+cnECVw== X-Google-Smtp-Source: ACJfBotkyhscTlAP4jyhh1fNPt0ew9XKMuIe9KfT1G8xTMw4YRMbicgUcTilEhcputnwNSFLSazMBg== X-Received: by 10.98.200.153 with SMTP id i25mr13459264pfk.241.1515636584073; Wed, 10 Jan 2018 18:09:44 -0800 (PST) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id i85sm38450128pfi.54.2018.01.10.18.09.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Jan 2018 18:09:38 -0800 (PST) From: Kees Cook To: linux-kernel@vger.kernel.org Cc: Kees Cook , David Windsor , Vlad Yasevich , Neil Horman , "David S. Miller" , linux-sctp@vger.kernel.org, netdev@vger.kernel.org, Linus Torvalds , Alexander Viro , Andrew Morton , Andy Lutomirski , Christoph Hellwig , Christoph Lameter , Laura Abbott , Mark Rutland , "Martin K. Petersen" , Paolo Bonzini , Christian Borntraeger , Christoffer Dall , Dave Kleikamp , Jan Kara , Luis de Bethencourt , Marc Zyngier , Rik van Riel , Matthew Garrett , linux-fsdevel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, kernel-hardening@lists.openwall.com Subject: [PATCH 27/38] sctp: Copy struct sctp_sock.autoclose to userspace using put_user() Date: Wed, 10 Jan 2018 18:02:59 -0800 Message-Id: <1515636190-24061-28-git-send-email-keescook@chromium.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515636190-24061-1-git-send-email-keescook@chromium.org> References: <1515636190-24061-1-git-send-email-keescook@chromium.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: David Windsor The autoclose field can be copied with put_user(), so there is no need to use copy_to_user(). In both cases, hardened usercopy is being bypassed since the size is constant, and not open to runtime manipulation. This patch is verbatim from Brad Spengler/PaX Team's PAX_USERCOPY whitelisting code in the last public patch of grsecurity/PaX based on my understanding of the code. Changes or omissions from the original code are mine and don't reflect the original grsecurity/PaX code. Signed-off-by: David Windsor [kees: adjust commit log] Cc: Vlad Yasevich Cc: Neil Horman Cc: "David S. Miller" Cc: linux-sctp@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook --- net/sctp/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index efbc8f52c531..15491491ec88 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -5011,7 +5011,7 @@ static int sctp_getsockopt_autoclose(struct sock *sk, int len, char __user *optv len = sizeof(int); if (put_user(len, optlen)) return -EFAULT; - if (copy_to_user(optval, &sctp_sk(sk)->autoclose, sizeof(int))) + if (put_user(sctp_sk(sk)->autoclose, (int __user *)optval)) return -EFAULT; return 0; }