Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp2053244ybb; Sat, 21 Mar 2020 11:39:48 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvcuvuQ+gAc+ITBwfFaDituJVwUAfIeREwPr27BpUOnZZO5gCUJQHP9R1BBrLR1bNdx1ynt X-Received: by 2002:a9d:61d6:: with SMTP id h22mr11315625otk.6.1584815987958; Sat, 21 Mar 2020 11:39:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584815987; cv=none; d=google.com; s=arc-20160816; b=ptYbaFnKypb4+VBIzw9wZuiRnayRbA9RRO7Fdfq79wSOCjCt3Ir+De63PSLz8AiqoC 3OFI3Vq323K/Y/9AF10QC6jsKVoJ2JPyUJ21Ss/j4D8mQUdategIZBj9zReOl40Um0Bk OMMdo10xx4/BmLpNckXQrn/CDt2gci5Hc/I5QItz3PKPr1/ma6SbgEOD02aowdHOoIC1 O/vwd1i9NQb4hXBxykz1t7RIPTwcUlHRBl1mYKYEUiA0vgmICgs0RTMgfk/TdP0tyqmh CMqU8wiKDWElUV6hDojUsCukgEUn/t88wZ/EUQL3sGeCzEIeZ745rx7FNCIUiZGvjwWj 021g== 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 :content-language:mime-version:user-agent:date:message-id:cc:to :subject:from:dkim-signature; bh=yJsfugZDU7DZQtM62SLLjOYi0hS3mhuiYGirhWMRsNI=; b=Zy2Cig0GPPnoYkbq+KnsGAgaY+6y1SyzQEUP072mp+9lgFQ7IabH5vbG8MsiObIpFt Y/VLwT2Bp/IykdlyWtelXtEvGFMO6hN/dR2SGYMrHhtRL51ZThwHR0IrJqoQtJNX14/p miGLfQvJtIV3CvI2pbyktx2nRSTsryzyV2eKuuSPmnHtEtHG3di0f/EVcyLuhf7z1Y1K 6xv8eWACaRHiUI5RPdxVjYFQR0BU6SOPR9U+06ZpSSw/3TJYN3Npi/AFFJfCiQuJNgP5 srvtTOKPaiFbHyLvyhFjLZjiXMAnJGvtgQUAy5RfAENDX7XGqaeTdtMVd+sP1nzJkuWv 5moQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel-dk.20150623.gappssmtp.com header.s=20150623 header.b=Z+UtOWrb; 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 f207si5045381oib.65.2020.03.21.11.39.35; Sat, 21 Mar 2020 11:39:47 -0700 (PDT) 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-dk.20150623.gappssmtp.com header.s=20150623 header.b=Z+UtOWrb; 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 S1727296AbgCUSij (ORCPT + 99 others); Sat, 21 Mar 2020 14:38:39 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:43649 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727015AbgCUSii (ORCPT ); Sat, 21 Mar 2020 14:38:38 -0400 Received: by mail-pl1-f196.google.com with SMTP id f8so3963152plt.10 for ; Sat, 21 Mar 2020 11:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=yJsfugZDU7DZQtM62SLLjOYi0hS3mhuiYGirhWMRsNI=; b=Z+UtOWrb663FAQnoPIp6OLW9eYD8xWzoFnGvXcjjz4+Bqbe4qEgzBzbZLh7s4nudvh GjyRXr5NrmrDBhcVBoPxbTUEeb5ECrCq3mdSJARLTyQTyCyIL9sTpw59aUQMPBx/abyS gjvVxnXlekNAL7OJwSjBClx9IDJ+CRnRG7XGhgvs7atR590Ylv6AEgaf2WPRWKA9gErp m+ea3e36drQECgquMdkLkSOIn99l8JAIyy/R9DZMhjsxAhM8wyE5pBzbvTQBQ8+jdSGg ZDgofTQVYoOAo51b755WMD7xdUYd7mUTSCj0Csy1Sjmj7CR14uhlbqYk9njFwRRskeYg p0Eg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=yJsfugZDU7DZQtM62SLLjOYi0hS3mhuiYGirhWMRsNI=; b=TQOQGRIryqbd+lhWmIEtc6iUr3A/Jl5hsADQnyOKrTRr922X4KUyJRJ2hvrNo8ElbP 8WIUoFvty+w5gqPi61UGy+gxHwoI8Exo1g7e5AdVp6Tw2kiPKTG5GkxppNLV90YzhkvG ic4ZokeUMfs1DyrS55HKnqBlxSJGkI3A0hmfPvZmv1TGxuE8NAPWlreEoIv3wBJAoXkw BxsnDfZRv2Rp0hxyl8fZCZ0XG2NSeLUJ/H6cpPVnE/KjjXfvalxbLsDIfL31mHTDJbj0 59dPnva5Xrsn07yiUlcHGNvnnKfn7kNQ9AfsnFkp2ag4UpTwD5rgVoH6B/3sRWDKPoBY /jRQ== X-Gm-Message-State: ANhLgQ1qiS0IPei8woLlskEio7A6F5DqGYYhCa5h5peORkYlRyM7ZPpo I77v4QuO3DXUuOq6TfZTY6Lemiw5IPYFcA== X-Received: by 2002:a17:902:bd92:: with SMTP id q18mr1696500pls.282.1584815917630; Sat, 21 Mar 2020 11:38:37 -0700 (PDT) Received: from [192.168.1.188] ([66.219.217.145]) by smtp.gmail.com with ESMTPSA id e38sm8208653pgb.32.2020.03.21.11.38.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 21 Mar 2020 11:38:36 -0700 (PDT) From: Jens Axboe Subject: [GIT PULL] io_uring fixes for 5.6-rc To: Linus Torvalds Cc: io-uring , "linux-kernel@vger.kernel.org" Message-ID: <51feabdd-c2e2-e24f-92af-edf4b2b0f54d@kernel.dk> Date: Sat, 21 Mar 2020 12:38:34 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus, Two different fixes in here: - Fix for a potential NULL pointer deref for links with async or drain marked (Pavel) - Fix for not properly checking RLIMIT_NOFILE for async punted operations. This affects openat/openat2, which were added this cycle, and accept4. I did a full audit of other cases where we might check current->signal->rlim[] and found only RLIMIT_FSIZE for buffered writes and fallocate. That one is fixed and queued for 5.7 and marked stable. Please pull! git://git.kernel.dk/linux-block.git tags/io_uring-5.6-20200320 ---------------------------------------------------------------- Jens Axboe (2): io_uring: make sure openat/openat2 honor rlimit nofile io_uring: make sure accept honor rlimit nofile Pavel Begunkov (1): io_uring: NULL-deref for IOSQE_{ASYNC,DRAIN} fs/file.c | 7 ++++++- fs/io_uring.c | 18 ++++++++++++++++-- include/linux/file.h | 1 + include/linux/socket.h | 3 ++- net/socket.c | 8 +++++--- 5 files changed, 30 insertions(+), 7 deletions(-) -- Jens Axboe