Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5616827imu; Mon, 26 Nov 2018 03:04:04 -0800 (PST) X-Google-Smtp-Source: AFSGD/WLrKsFVEBKgRwoHebzuX/6bd95fwO5mCYlbw8kf3KMUcuQjESIlOJLMn8kSBWaQJWBb8Sf X-Received: by 2002:a17:902:981:: with SMTP id 1mr13175297pln.142.1543230244636; Mon, 26 Nov 2018 03:04:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543230244; cv=none; d=google.com; s=arc-20160816; b=fsR6Dq4hvNME9qAp4wmBJIXV2B1R/8Ele0A28hu8+4qAtMPAPGPqScCdcItSaRXAEy muJ9TULRfTmSdHUWAOH8SNFqbjZjQgsMl22QvDNjH5V8jC7tAnqqrLijoGxK5v1XPF++ 6BJiLYTO5i3NoZt0OfNFaFfPEBQSF2eVMTxPeIxNX1iHG/vHvLmCr8kbv2h72xRLi9ba q/5Mf2xdToB3jeaynkRbre2dgeJUr2WKywtGguwJfK8P68rpmLU54LTWz1zbxa6Y9g+c F3vsQUWWOMxg9X0mEDzVsrvUEB6TgtMtJ4BRGnnMIrwgdlk3HlfWV9V9z1YZHrQX3NtA u9LA== 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=kCYWZefQidkP6xl/RyUxDOZrcw+xj8DheYRJStWW2oE=; b=PBCZNko+b/VTHwENjtWSwZrNhD2kYtBa58M4z5lA2FCkmKkaeCH/ihV4ZhRpgO+efK OnTrt0VIGpXb/KbJ9XnsyKWIwif3FxGZn/J9VBLTImS8X7wHXV7DPsRYV2uKlqBqBOtc gnH7zZWmQ58QaW2q5OapyRgc2h6M0nQtRNob+DTff8nOtQEmO8CLMsptkPXqeGof6sfs Z4nPWYHzERAu95a3666H5Z0WLVOCadwD9gRYYLR2nGjzesGgY7tcnlLn8IS+03493Cg+ fue96rOSwQVGTB/Izn+IkT7LupsqzT/IZJv7oM+G16WgAheN49C4lje69UBfRU0yuYYi mvvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dImigbXc; 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 a5-v6si60999400plh.157.2018.11.26.03.03.50; Mon, 26 Nov 2018 03:04:04 -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=dImigbXc; 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 S1730110AbeKZVzH (ORCPT + 99 others); Mon, 26 Nov 2018 16:55:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:37520 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728901AbeKZVzG (ORCPT ); Mon, 26 Nov 2018 16:55:06 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 978EE21104; Mon, 26 Nov 2018 11:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543230081; bh=NPXZctWdD8HkuVKfjvbEvSEuG4lx8Z4qdvAFPo/WUHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dImigbXcWomY7t2ypfOGI6j+4vEcMFKFq27VziGSF22xl6GRU3BHxnE3koG6yZ49n 835yWuTWy/qcOUm9Lx3rTiGjyymB4aWnA+iIwfXIXHX+rAuCL51GVLOkSveAN8O2lI 6rZgwFEE+CYxWiLxqk+LnDkE8J44L8TRV8Fv6qtg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Dryomov Subject: [PATCH 4.14 62/62] libceph: fall back to sendmsg for slab pages Date: Mon, 26 Nov 2018 11:51:43 +0100 Message-Id: <20181126105055.188894611@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181126105050.592727680@linuxfoundation.org> References: <20181126105050.592727680@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.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ilya Dryomov commit 7e241f647dc7087a0401418a187f3f5b527cc690 upstream. skb_can_coalesce() allows coalescing neighboring slab objects into a single frag: return page == skb_frag_page(frag) && off == frag->page_offset + skb_frag_size(frag); ceph_tcp_sendpage() can be handed slab pages. One example of this is XFS: it passes down sector sized slab objects for its metadata I/O. If the kernel client is co-located on the OSD node, the skb may go through loopback and pop on the receive side with the exact same set of frags. When tcp_recvmsg() attempts to copy out such a frag, hardened usercopy complains because the size exceeds the object's allocated size: usercopy: kernel memory exposure attempt detected from ffff9ba917f20a00 (kmalloc-512) (1024 bytes) Although skb_can_coalesce() could be taught to return false if the resulting frag would cross a slab object boundary, we already have a fallback for non-refcounted pages. Utilize it for slab pages too. Cc: stable@vger.kernel.org # 4.8+ Signed-off-by: Ilya Dryomov Signed-off-by: Greg Kroah-Hartman --- net/ceph/messenger.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -594,9 +594,15 @@ static int ceph_tcp_sendpage(struct sock struct bio_vec bvec; int ret; - /* sendpage cannot properly handle pages with page_count == 0, - * we need to fallback to sendmsg if that's the case */ - if (page_count(page) >= 1) + /* + * sendpage cannot properly handle pages with page_count == 0, + * we need to fall back to sendmsg if that's the case. + * + * Same goes for slab pages: skb_can_coalesce() allows + * coalescing neighboring slab objects into a single frag which + * triggers one of hardened usercopy checks. + */ + if (page_count(page) >= 1 && !PageSlab(page)) return __ceph_tcp_sendpage(sock, page, offset, size, more); bvec.bv_page = page;