Message ID | 20180119203013.GA66428@AM-iPhone.dhcp.thefacebook.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="F1w8xn1N"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="SmAHCUUy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zNXWq4S37z9s7F for <patchwork-incoming@ozlabs.org>; Sat, 20 Jan 2018 07:30:31 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932231AbeASUa2 (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Fri, 19 Jan 2018 15:30:28 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:35806 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756027AbeASUa0 (ORCPT <rfc822;netdev@vger.kernel.org>); Fri, 19 Jan 2018 15:30:26 -0500 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w0JKQF87019195; Fri, 19 Jan 2018 12:30:21 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=date : from : to : cc : subject : message-id : mime-version : content-type; s=facebook; bh=INI5gl2F/XE5Nhv2N4WQT01m5ZTqtkQoN+c0sas/ThU=; b=F1w8xn1NHG30l9VnfyL1Q/G9GnERNAn9wZVLKbZj7MCjR6aipsO4+tzs5Aurrh6wF/m1 cq8cPrYiACrvpd3CcTboZaBPtk+Z0XwCe0Ip0ttQY/P8gpJLq3uKfw1OWSyaY1zcyukY QXDDu7r+Qogm9CPU7Jng8ynTtFHhItAdQx0= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2fkke90tb5-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 19 Jan 2018 12:30:20 -0800 Received: from PRN-CHUB02.TheFacebook.com (2620:10d:c081:35::11) by PRN-CHUB05.TheFacebook.com (2620:10d:c081:35::14) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 19 Jan 2018 12:30:19 -0800 Received: from NAM01-SN1-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.12) with Microsoft SMTP Server (TLS) id 14.3.361.1; Fri, 19 Jan 2018 12:30:17 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=INI5gl2F/XE5Nhv2N4WQT01m5ZTqtkQoN+c0sas/ThU=; b=SmAHCUUyTQ5mCqOV8m3UZjMCvS6WOaBe1pl5USc5vJ2mFDBUIEcNn2HN4X9Rp8yUMpKTRdybKeqTztxH+tYCZkKfxXjXCzac3SwcH67aliQbDklT446vNLYo9BWB18LIUv/wv0/pvdAd22B1hZAUDv7bbK/yhvwGnQN07Mm6lhU= Received: from localhost (2620:10d:c090:200::7:8638) by DM5PR15MB1755.namprd15.prod.outlook.com (10.174.246.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Fri, 19 Jan 2018 20:30:16 +0000 Date: Fri, 19 Jan 2018 12:30:13 -0800 From: Dave Watson <davejwatson@fb.com> To: <netdev@vger.kernel.org>, <davem@davemloft.net> CC: Ilya Lesokhin <ilyal@mellanox.com>, Boris Pismenny <borisp@mellanox.com>, Aviad Yehezkel <aviadye@mellanox.com> Subject: [PATCH net] tls: Correct length of scatterlist in tls_sw_sendpage Message-ID: <20180119203013.GA66428@AM-iPhone.dhcp.thefacebook.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline User-Agent: Mutt/1.6.0 (2016-04-01) X-Originating-IP: [2620:10d:c090:200::7:8638] X-ClientProxiedBy: MWHPR12CA0061.namprd12.prod.outlook.com (10.175.47.151) To DM5PR15MB1755.namprd15.prod.outlook.com (10.174.246.137) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc62c7da-aff5-4f64-20c0-08d55f7b73a3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DM5PR15MB1755; X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1755; 3:TN7Zddv785Uqmqo0N701ILPuXF9PGCG9MweVQe/nXEExMtgPyjltKtbw/gEFccskdBwJaAZzLNLRAt5FZ+o7FRgQk2I2grDIlNQ8qi0wng8AZCbtDSZ0eWmih6xPgbWJJHyOXQkyaspNdylymwotcahuilfpwiYnyUua0NRiEwR+V4yqnvzmYJCxuyfrEQ425RN+yxvYctwukJbdG6FUaGYeYyJClH4UBfkYDq/8u5XycqMoYZxw11Yb+uLy1fnS; 25:Gzszc3zHSAZwhhndO8ix1Xk/BDTM1aCE5/ryXoovyrimV2TDdSMnT1Or85d0NP4/DV2rY00IMALWRtsxTbRyRi1KvdujwWW/bRhk9iTNdqWXwiHg5CzxnxSZ/z7IxelAi/pVBDVc7XqXQvbhwWa9pEWt4L2y1B/hvAcG81gjrz1WNT+P8hqn5k1qb9/e11hjSOdDGrBN+DVR/QzE3ERQtvdTQXA0LfO3gUdxHGFN+3DU6kPw5Jh1YfCPPRAsWw3vfHn0lf56lyIztQ7AbFQMlDJg943Z0gmyjFLah7A9GH8pnTvBBnDfvYpr3/ulAUvViPdF1tggd/HM5Dbd1zJ+Uw==; 31:1KUePxeUBfgC94MS0cAVi7EmSbluRaQ8z4vRGriRW2SfYLrXuYJ5YD2qN/ycXzKiYpyC2f+fVuTk1KOVy0Bctbf+2yuOIhuWTr8gjwNskxbe0O6BrLteGu7MyK/AIoZ+B8tm3yxkkaWtOEXj9me/2DQrYC1Bvy7uvGg/PfFqRknDLm+XKNGm2s60hMA6g8FLBtSQHGLbEpxz9nj1c4/BKxjLKKojIEVQtieqWKaEdvs= X-MS-TrafficTypeDiagnostic: DM5PR15MB1755: X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1755; 20:pHps6W1tJ6rgaZK3Ot1phFylRsxuWI6BfvqpmIJosqKAo21OFX7N0QrnaZG18IV5zjvJETp7ZCEaUR+hPk1zheQ8qQdXKmujcLeiX9vMYH2MlDL0UmypEikxoInp5ffS+1Yr2uAtrCAz7WBAsvBTM5UhmeU6F7IPbQsEPlfb/mx/FRWWoL3JCjifCnoKd00oe4HGgbb+Yq0bYklqGPXs0ZRG+lN/ptitngdUSdD8b8ggCdNRWxz8fRipavyb2IhAwlPJ9UfZSlvybf+Zx/xXtm+yGjFDIJDWyz1AowfxofGGdEKrXOVK57C1ZOdlrJf86C49TgRn62fUWu0k3+FbNXR4m1KY5c2NK2hFq7LAJxpymrMRkMOr8GzPo4DT5zpIXtoreHqLHUviFGiAkjH4C4bWtEVEo8ueJ2eyrjdN0LST8u30gkgTFEEf1fWj856K7AcHDcqM/hw5gB5r4fvmLXwMRCSLZVkXl4T6tLg50g8EC10GXU0oJYqMrMIjnbzo; 4:otgHkjP/1Q2e3kSa+nwBqzdzJulPwWsYMTOtCQUx59DZTh5IiI5kld1XghzZa0eqsUAqZjvKuc22ofp6KMwPSTUsArJuRNFpCrMaVhoYUKxjfpZODC+n18AUKinwWWw9cBgw7pBLYnoObtTY5Y/HSELyeHFLrR5LoK9KJw0dLFr+0tr5jplGkzk2csPtt2bEf1t8DPossom6PCpySB4VDNLh8TdNjhpPsVhB0G2g2W+S1b8Z3o298/F/tGbPcjuYF8LWdDr3xjOjnYSEEZ9qvhyitHq+HtGf5DnvJGpzg3JEVkqpPU1ME2iL8qEbj5S4p5Zk9riuvnWLc5vTeTFFB1YHZvnLP4W9pQl5Cvccx88= X-Microsoft-Antispam-PRVS: <DM5PR15MB17558DF7228BDCD429E6A7F7DDEF0@DM5PR15MB1755.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484)(266576461109395); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040498)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231023)(11241501184)(2400081)(944501161)(10201501046)(6041285)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR15MB1755; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR15MB1755; X-Forefront-PRVS: 0557CBAD84 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(39860400002)(396003)(39380400002)(376002)(366004)(346002)(199004)(189003)(83506002)(68736007)(23726003)(105586002)(6116002)(53936002)(50466002)(478600001)(386003)(33656002)(86362001)(25786009)(4326008)(76506005)(97736004)(2906002)(1076002)(5660300001)(6666003)(54906003)(8936002)(16586007)(6486002)(316002)(33896004)(52116002)(58126008)(6496006)(8676002)(9686003)(305945005)(106356001)(47776003)(81166006)(52396003)(81156014)(7736002)(18370500001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR15MB1755; H:localhost; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1755; 23:ddWsM1PHMnLIfz2eK/Ov9solRN/sSJ72Cjdbnjr4O0y4X4mHD9EdmHwOKKcsYOjcJdRp+sVhdNI6LLTQlHTAu9Ncbwo9pJbH6Ak4SERw5bnPFRE1ZNRZtHFFvdjAWEL0avm9jyz1dzqdRcdfuduHRnID3QhcV/JnZgqmiSPHdsp+FV+0vr/zyDKv7xq+GL3qr2uv2rvD3GMwiEuoqdk8vYG9/00aRXH34kd7XAO9iWhir4prtHJj0dQnuueXYOIvLibm1HCPE8dcBpXqOlPNVJhbyPJJqVppgFRo7HNfIZoU6PVXWEp3gkAEQS+fNmvq0f3bjvfN5CilVMIsHuzuE1a5r0WCbQbxLbN76kxoFrfdeLcWcumtqymLBkK7FtgF4MG1i13U5L0c8Qj65vo9me6cHWBw3W+/XtMvreGZ8P6nhkGU45yue9lBzZEVPri7oFZOdQm3oumPpmM0qegT7NrCuj0pXRFqZ4SK1clcfeIXdEo8BPVjCfo85I0S7Z6bE1wSJxBirH4FC+ziAlvCn+aPsPVxdqAbRMMWcZLnl9ClRslpLF94mpfOm/mc5FCla0sv51sz30qrdOV+tY2IdxylNsr5llzLRZLeoycsqvrj5rJAZk1p9LUL79NtApYy+ay54G9y8I3QVy7TvBXn2TNobWBU7dl+iQMJutqT75AV4utxwL1x1Sugq4Se1b5DgXmN7ELqBL/ia52BROsxxeIqHIKkfHlfp26+HeAbtUVbAAblETIiDWIHWUFLj+aJTWdBvbCF9kLKdzJhtrJvWd97bQdXw/ib/A+RzDk7pZEOHXiGuZUQ9p3Ph0bGkyV6LnwQkT3MfhcwS0KCFfiJi1qJi/TaJickOiVqfuozDd7S+nc8D6xmVJV0/uxtlzej5NZy2lFFvSx4Z05NckRv7s7hqORCPMi4wlzhCjaUVrDuGq7i1fgAqVHn/lqsI57Dfr18LQbi/jEvpjQ5ck0CDAy6ArwRnst08lEgbmkMrTngLBn5JbLeVIZGVdISxOKJrfrzgK8hY7gYeQLa81ARqR47XixxFGyZQFwyOxRtTikCMuxHgKzaWJgaUWMJKnrVbyGXikasPziooUvUK8iNZw== X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1755; 6:vtUmdmDSpgeANxVfPKa91X+5RkB7Q65Kz8syrh2QvyAOi4VYkAGlYIo+CO2yl1MvGyOluUVe0PQDMoo1AeD4KdFLUfze14yTJw1KBY+/eUdrzwmVZHNZI/VX2hhj0NyzfJhn+Lgoy+CUoQpsOcC+iLNW006LDPjzh54JmeD8gOXgSntCtL5N25uEC0rkzQaYPDbzjrNm+e9LghjvuDoHyCCwUauRrYBjPuyFFpqwMLtuUcj5KddkGLdk0XIxG2OJ+oXDMUCDMdi+RIIVuwTjPyuPylPWWo+CBiSre/Rbd9lWFob/7mtWG56Te4y5h8UVx/rt9GluUDNLEPtUqAlh8e5y6kgDMTYptfQxdXJJ0bc=; 5:C2hjiBNauHvekXNMLy0MTbY/lLvVmIaKMPVlfccJzIfOIFNzDeHHIWMfgSIY0lmzXo0zU82TcqyIzwdi/p+k4kfEWemr17cbdZrxes3LVTlTGpgjn7Ip4yazcHRuz+Z9iW0LIeB9NR8SMVJoGXJZkVNQtYT8f+Srz7/o4H2fm14=; 24:AKRykO/qiMB9DC2nolekWbTnRuo6kmgHS8l9t2GQRPeGqjuTb/bFfbI8GGiCxhEgg500+rZbi70LhhTlG7FaL6t8wzLkMWaLHb9ExNBMm9g=; 7:ma+YcEtBJqWtzN3A53+H1JD5eZ+CpIH++nX9PsFq2oDEENMVPG442Iaw/oFYFQZbJy6SNa5uyKNCh9dP6VxBFj0f7OaEeyuyfrSELG1iXsmsQcJXxDKh4ANiZYoASbUU6tWhaiaTo9Aatb0CNLK5bJEE18Rz9ev0/GR7CEdO4AkYUj3uFH9ib20S1Eefp4Myx3o5mCfVwcOnmZpm8hE3PYOQLv5tPnZb2LNf/10rZp8ZmHoy0cnnMKe4XwrDVqtN SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR15MB1755; 20:ekJzqgvKiIe03qDz2sQGi2kKojASiNL2HGqxH3rJCDOG2JhAa9xzCmFh5+8m8E+3OKIkQagnxJzpOHt639aN5P65Sd1H07j0Z6sd/xNTW33qsCl/QE9sLZZlaEgtXd+ZKJ1Fji81rBmht8aeVTFeElEZ3j3ggBhrsHkN30DQJrY= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2018 20:30:16.6448 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc62c7da-aff5-4f64-20c0-08d55f7b73a3 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR15MB1755 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-01-19_09:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
[net] tls: Correct length of scatterlist in tls_sw_sendpage
|
expand
|
From: Dave Watson <davejwatson@fb.com> Date: Fri, 19 Jan 2018 12:30:13 -0800 > The scatterlist is reused by both sendmsg and sendfile. > If a sendmsg of smaller number of pages is followed by a sendfile > of larger number of pages, the scatterlist may be too short, resulting > in a crash in gcm_encrypt. > > Add sg_unmark_end to make the list the correct length. > > tls_sw_sendmsg already calls sg_unmark_end correctly when it allocates > memory in alloc_sg, or in zerocopy_from_iter. > > Signed-off-by: Dave Watson <davejwatson@fb.com> Applied, thanks Dave.
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 61f394d..0a9b72f 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -577,6 +577,8 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, get_page(page); sg = ctx->sg_plaintext_data + ctx->sg_plaintext_num_elem; sg_set_page(sg, page, copy, offset); + sg_unmark_end(sg); + ctx->sg_plaintext_num_elem++; sk_mem_charge(sk, copy);
The scatterlist is reused by both sendmsg and sendfile. If a sendmsg of smaller number of pages is followed by a sendfile of larger number of pages, the scatterlist may be too short, resulting in a crash in gcm_encrypt. Add sg_unmark_end to make the list the correct length. tls_sw_sendmsg already calls sg_unmark_end correctly when it allocates memory in alloc_sg, or in zerocopy_from_iter. Signed-off-by: Dave Watson <davejwatson@fb.com> --- net/tls/tls_sw.c | 2 ++ 1 file changed, 2 insertions(+)