From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08D2BEE14C3 for ; Wed, 6 Sep 2023 18:37:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243877AbjIFSh3 (ORCPT ); Wed, 6 Sep 2023 14:37:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243916AbjIFSgD (ORCPT ); Wed, 6 Sep 2023 14:36:03 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08BFA26A4 for ; Wed, 6 Sep 2023 11:35:03 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d7eaffe2f99so119012276.2 for ; Wed, 06 Sep 2023 11:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1694025281; x=1694630081; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=hJltTaOgL5jEO4WF+/Vz9Gw2r17/bIVfgXIk3gpklQ0=; b=ZBkElbtxY8+7TLIrlgLpWVdSV0K+mkpw6JYmfN41F7Wn3XAvD7IQoOx0RxFQ9erVNR 3ReSgxlDWPfPbH14qJ+zNpVtJgm7a7lpQ73zeKvFs567ceYu+cdSOjrTwx4lycdzEMky ufE0kTwnCdtn8jLEohVW+ULhALXbTAD+PAkuhiec5/ScwsUp7AiBJVDG6mEOQ7sLVvw4 aNAa1b8XdFyRu87ho7hFb2nVVdKjB8NVrQNZdZkUBTL+aFOiC4bQOlcTJyIocH60pqyD jNBtF0Rxt2DYWoCMfKZc4ayXjmJz/cF2nBvxXgAdUAbdyyfpl7Jh/ngPtV9CaqDpt6gi XLwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1694025281; x=1694630081; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hJltTaOgL5jEO4WF+/Vz9Gw2r17/bIVfgXIk3gpklQ0=; b=ea3uvMFJC/RhDaesnMspPNcZWHchN6KRGb/87I8JSFLOyTQTAU9/zqQPzbvsaOpBXh 5Skn0gLoFcrH338ypzFk44YmaRwjP7ewA4tnQ6ERg+Wks2ao3iMohBtPk7hw7PduZLcl 6vmtrc0OWf7mbHTdRMb/+4F+zgpKnfR9G/1EEN7UDFhpAyPdA1BjmS6hkN79t2LqSeQH yqf8a09h5Zx8+qFbHYZdCscjkr7nKOQpmFUonSFzhgm0bAF3jBTPzPoGyo+lQlLhl2pR Y0U16wqC+6mwYhuRO/AwHJhIjLAW75s5N8R4PnU8VQ3H3C9Mr5jl1UbBse3bYszuWQbY j/fQ== X-Gm-Message-State: AOJu0Yxw5xdUA55h/NGMLXsDrQx4vXw8AFtUz6jLdoQqjlNfwuZE92va gAvR87Tm7ameT1N2i977Ag3ThVI= X-Google-Smtp-Source: AGHT+IFhuu2m/WV5JV2cBMSFsDFG5jxjHWU+oNXD57WJzhNfO2v6ypwJ2+8P7l5k9Yg1Ux0KHyvAtdw= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a25:e0c7:0:b0:d63:8364:328 with SMTP id x190-20020a25e0c7000000b00d6383640328mr424401ybg.5.1694025280934; Wed, 06 Sep 2023 11:34:40 -0700 (PDT) Date: Wed, 6 Sep 2023 11:34:38 -0700 In-Reply-To: Mime-Version: 1.0 References: <000000000000d97f3c060479c4f8@google.com> <20230906075730.6d61420a@kernel.org> Message-ID: Subject: Re: [syzbot] [bpf?] general protection fault in bpf_prog_offload_verifier_prep From: Stanislav Fomichev To: Eduard Zingerman Cc: Jakub Kicinski , syzbot , andrii@kernel.org, ast@kernel.org, bpf@vger.kernel.org, daniel@iogearbox.net, davem@davemloft.net, haoluo@google.com, hawk@kernel.org, john.fastabend@gmail.com, jolsa@kernel.org, kpsingh@kernel.org, linux-kernel@vger.kernel.org, martin.lau@linux.dev, netdev@vger.kernel.org, song@kernel.org, syzkaller-bugs@googlegroups.com, yonghong.song@linux.dev Content-Type: text/plain; charset="utf-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/06, Eduard Zingerman wrote: > On Wed, 2023-09-06 at 07:57 -0700, Jakub Kicinski wrote: > > On Wed, 06 Sep 2023 16:50:23 +0300 Eduard Zingerman wrote: > > > diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c > > > index 3e4f2ec1af06..302e38bffffa 100644 > > > --- a/kernel/bpf/offload.c > > > +++ b/kernel/bpf/offload.c > > > @@ -199,12 +199,11 @@ static int __bpf_prog_dev_bound_init(struct bpf_prog *prog, struct net_device *n > > > offload->netdev = netdev; > > > > > > ondev = bpf_offload_find_netdev(offload->netdev); > > > + if (bpf_prog_is_offloaded(prog->aux) && (!ondev || !ondev->offdev)) { > > > + err = -EINVAL; > > > + goto err_free; > > > + } > > > if (!ondev) { > > > - if (bpf_prog_is_offloaded(prog->aux)) { > > > - err = -EINVAL; > > > - goto err_free; > > > - } > > > - > > > /* When only binding to the device, explicitly > > > * create an entry in the hashtable. > > > */ > > > > LGTM, FWIW. > > Thanks, I'll wrap it up as a proper patch with a test. LGTM as well, thanks!