Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp903898ybi; Sat, 15 Jun 2019 14:45:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwq+V7p2NNDqYfwtHUC2rciKsHoYasrhP2Oi9CkLyqwo5ALv5NoQXaQLuF/6/p0nWvPkCIE X-Received: by 2002:a17:902:b115:: with SMTP id q21mr39145993plr.36.1560635139134; Sat, 15 Jun 2019 14:45:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560635139; cv=none; d=google.com; s=arc-20160816; b=sTi+9mJHsO0oy2RHtGy9c1e65RbPkS6UeNxoJc/kc6IuH3Tpq/T0geAjtnETd/DGCb s1I4ulzdpveL+Tujw7Uh99f65Wp9rd8SBDOy3VVtcW5HXfvCK44vG3kuxkKSoxwkyuow CepmfexdqXgiJQFmfOWUjqLIbbNJD6mKtSvy5+8wz4UnoAbHEHBoICOoN9AxWUC4KR76 52UH9P92v90NoRsEUToZnAegXigoZ+PQ4LTBZ1M+unQHj92Ctd6FDlV8LULYYyCgbw7N heZDJS56dZf7E1avd5eg2Lw9CBKtrb3v7T11jgVYhBWJamHDBHt6JR2CNt2wUQA26WwS zbKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:dkim-signature; bh=exVM99lG/xDC8wNkJ4onOek50O5CPQsnZ8sIW3tB6IQ=; b=vIYCCWbqBnRNwP2E29s8q3GRlyNbb8D7k5U73V4kya4j1N4juTDh4wdklu0apcKZxp tF8wb+2EW3KlCKwJ+OI05SVe9jcDWEhlalX40Wy4r77avuBK8hkVC1NWqWP3JXwo7MaZ 06YNV7IIpFVg14eKi5sUhduDCsZ6hLVwp0ZrR3kYarph5W0FHkBLpf2mtHuiNZ8ILYh6 UfifcXTqiNfA3CJpuaFs6SpIc35np1c5HwWyWU7AMJT0y90j+eXyoKTAA5Ml8NmskhiP M+rdHn6eEziXZ0NzlutYHNXSujuudyX9ZvTJbvB+pMvY6etvUfDufjQTKIcfCl+2BaPd RiZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=Nnwr4t7Y; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q28si6092825pgb.375.2019.06.15.14.45.21; Sat, 15 Jun 2019 14:45:39 -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=@gmail.com header.s=20161025 header.b=Nnwr4t7Y; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726926AbfFOVpR (ORCPT + 99 others); Sat, 15 Jun 2019 17:45:17 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:35174 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725535AbfFOVpR (ORCPT ); Sat, 15 Jun 2019 17:45:17 -0400 Received: by mail-lj1-f195.google.com with SMTP id x25so5780903ljh.2; Sat, 15 Jun 2019 14:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=exVM99lG/xDC8wNkJ4onOek50O5CPQsnZ8sIW3tB6IQ=; b=Nnwr4t7Yh8+1DIk01779PsaXwLkAFCIZ2HBMljGP+BmOH0B0M1ESanqlM7aGabFfmb CTDQSu3WzOh+c25JkGv/wulvBd/GT8zjVJbwPPIgtMd4e+OW8BfTQZXnFhcBdmjcFN8E Ze1o+Pae5TgPJAGnFbQ+0yH//xhU4eUBFn0GDW8NNl40CB2H6P/+EV0bz8QvqdzPshSv ZtFMjBTJNHPsdXD1xKRorYPsTUPErBb3nwT9R9T6jIIXjvSn6XrVuLMKw6m7Au1sGhV9 rono3M6RAUBc2bCQY1uYBf+X0nJls+lTjQFQLwhZHYWBmCR3UGQGRcSdtOY0hKiC6Xe6 9rIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=exVM99lG/xDC8wNkJ4onOek50O5CPQsnZ8sIW3tB6IQ=; b=Xu1uNKiuGsYGP3wvEDs50xFcgvZX4igRX3r7EBJNMEWOMp8eRFToWktsMrafylncFM PUrQq7mGVDFt5vCOlZ7dLOgS32yYqbCBGeQo5Ge1WFbKbbhHS3HSLKNIftjd05MH+e9n Mio4k70T/WjzIeil5b947SUfbmpiXFqVcwTUDqPYjkk7adoO45wNhpXGjOpqm+9Lrmju zVTIG8/fO5W/Cwdyn6i7qGGG2Rk1i2vHO2Kz9XqaJ4mW8W+40epyrqoi4lzvmmtenwHz Fp7mLw5EebPPpn5RK9ece1Y1XjadUPny4M/X53INFI6kIns480HnUdWs8OkVXcmSFzNy oPcg== X-Gm-Message-State: APjAAAWE0D3JO+NnIpHc/iBYzSxrJThpj/VLeBEi3OGeVf5uzi7/mpzn ZqHuL2dyOf3jAjNmR+nQHzBqy0S+78QXOyuGP4k= X-Received: by 2002:a2e:9758:: with SMTP id f24mr2787891ljj.58.1560635114849; Sat, 15 Jun 2019 14:45:14 -0700 (PDT) MIME-Version: 1.0 References: <20190614093728.622-1-afabre@cloudflare.com> <6aaa3a2f-5da5-525f-89a1-59dddc1cfa53@iogearbox.net> In-Reply-To: <6aaa3a2f-5da5-525f-89a1-59dddc1cfa53@iogearbox.net> From: Alexei Starovoitov Date: Sat, 15 Jun 2019 14:45:03 -0700 Message-ID: Subject: Re: [PATCH v2 bpf-next] bpf: sk_storage: Fix out of bounds memory access To: Daniel Borkmann Cc: Andrii Nakryiko , Arthur Fabre , "David S. Miller" , Alexei Starovoitov , Martin KaFai Lau , Song Liu , Yonghong Song , Networking , bpf , open list Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 14, 2019 at 3:36 PM Daniel Borkmann wrote: > > > >> Force the minimum number of locks to two. > >> > >> Signed-off-by: Arthur Fabre > >> Fixes: 6ac99e8f23d4 ("bpf: Introduce bpf sk local storage") > > The offending commit is already in Linus tree hence if so bpf tree. Arthur, please > elaborate why bpf-next is targeted specifically here? It's certainly should be in bpf tree. It didn't apply directly, so I tweaked it a tiny bit, reduced verbosity of commit log and pushed to bpf tree. Thanks for the fix!