From patchwork Fri Apr 20 16:16:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jann Horn X-Patchwork-Id: 902028 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="MueVrMkc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40SLbY64n5z9s19 for ; Sat, 21 Apr 2018 02:17:13 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752291AbeDTQQi (ORCPT ); Fri, 20 Apr 2018 12:16:38 -0400 Received: from mail-qt0-f202.google.com ([209.85.216.202]:52603 "EHLO mail-qt0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750745AbeDTQQh (ORCPT ); Fri, 20 Apr 2018 12:16:37 -0400 Received: by mail-qt0-f202.google.com with SMTP id h9-v6so5270105qti.19 for ; Fri, 20 Apr 2018 09:16:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=EpzsEq3yNDQS+f0gwv8Pt+4BoiBw9a3VmMUrSfgvJus=; b=MueVrMkcZj7VL2NwlxDzz2lPAjYqHLPOlyx6W/OjtMADpFsJZ7ZEbB5mk3s/d4tpFs Z/MWNwS6nZ4LxRAiB7p4VIeKsN2PA7Lfsw52l8AiseMrg0qslXqGY8Fw0wTC06yt64Hy AIkZc7oYLXthVZmWeY0N+X7+XM1bM/+6MJpfQFcuU2qFymzrTLj4nJzHN029NPJ+AwjB Vk3R9kSxh2ualq1liRkWL5bLBv9LT5uQqSDfmX+bKkM45k2TvNdrwEVKTKVKW3EI3eiG 7MphlwekvIUUPLG1GlBPY3Vx7p+uJAPrlWzXED1FvV54cYIl7ki/vSR30cdjlHyJoMAc 3Liw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=EpzsEq3yNDQS+f0gwv8Pt+4BoiBw9a3VmMUrSfgvJus=; b=sowwZR1KYUpj7wZJab7V6+ObYJCh76PMj1NSVCEnKGG/dMdT641k3TDhSsXYMjh/xX Cmot6bHGLCpSo0IJxDZSDneKQD4qdIn6zKgQNbzywmTx0Gxahi8cqQgrSrhunX8qyhhC 759WGVL84233X+P0jNRtY3cr9X24JJnihxHYKDcMTiXhFa5R2+x3vdcBdQlHV19Y1UNE +RLPLI+NRGlX/g0Fc0nJg7RMRp/vjilslzWxk7OPMr9v0/uJEZZiAVYrZRwAHAt0o01y L08IpsQYu1Gb3mCYeEUBRRuRtpJUQCpAW0d2ASLjWFl74LxVl6i5jA6l7vuD97WkclHJ ty/w== X-Gm-Message-State: ALQs6tCzTgnMXA9aKohThkQP475NJMDjqk4NaNdz36GEk3Eg+VDfNW8k 3/8VRwIPyMnulaUDOMamLyYNLdfpZw== X-Google-Smtp-Source: AIpwx493AKxSQPq8bsV4FzfeX5F2Cig+5nitdIORGvFg9PSROMcQk81MneVwQQbecXSnB8eXj/k9pVKpHw== MIME-Version: 1.0 X-Received: by 2002:ac8:605:: with SMTP id d5-v6mr8199107qth.36.1524240996385; Fri, 20 Apr 2018 09:16:36 -0700 (PDT) Date: Fri, 20 Apr 2018 18:16:30 +0200 Message-Id: <20180420161630.233178-1-jannh@google.com> X-Mailer: git-send-email 2.17.0.484.g0c8726318c-goog Subject: [PATCH net] bpf: sockmap remove dead check From: Jann Horn To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, john.fastabend@gmail.com, jannh@google.com Cc: linux-kernel@vger.kernel.org, John Fastabend Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove dead code that bails on `attr->value_size > KMALLOC_MAX_SIZE` - the previous check already bails on `attr->value_size != 4`. Signed-off-by: Jann Horn --- kernel/bpf/sockmap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/kernel/bpf/sockmap.c b/kernel/bpf/sockmap.c index 8dd9210d7db7..a3b21385e947 100644 --- a/kernel/bpf/sockmap.c +++ b/kernel/bpf/sockmap.c @@ -1442,9 +1442,6 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr) attr->value_size != 4 || attr->map_flags & ~SOCK_CREATE_FLAG_MASK) return ERR_PTR(-EINVAL); - if (attr->value_size > KMALLOC_MAX_SIZE) - return ERR_PTR(-E2BIG); - err = bpf_tcp_ulp_register(); if (err && err != -EEXIST) return ERR_PTR(err);