From patchwork Wed Dec 18 17:16:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11301469 X-Patchwork-Delegate: paulburton@kernel.org Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 438C214F6 for ; Wed, 18 Dec 2019 17:16:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1EABC2082E for ; Wed, 18 Dec 2019 17:16:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="lHIItX6f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727025AbfLRRQP (ORCPT ); Wed, 18 Dec 2019 12:16:15 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:36547 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726960AbfLRRQP (ORCPT ); Wed, 18 Dec 2019 12:16:15 -0500 Received: by mail-pf1-f193.google.com with SMTP id x184so1570782pfb.3 for ; Wed, 18 Dec 2019 09:16:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=rsgLsLg/wxtAj9kO60kIoIvi8Gvu9M5kT2kkH8nAkwg=; b=lHIItX6fuQmi0XhrOTbnRwTehxKFE1FN1sEZ7rdOae4VBHmNGUVQOn2gyjtOyFklAr gqKuvEZeJzngwhbMGoFTfkbZb6WE0VfIzvVfkWthnU7FX2JVq0XmJZzl1zVaP9gIIriL Gyp2tfl1CeCw2U/LzXGQqnTHGL1VlOaK8W7bs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=rsgLsLg/wxtAj9kO60kIoIvi8Gvu9M5kT2kkH8nAkwg=; b=q0JmUjI/hbxcNm6FssI604Z0A3pnA9quYyO1+32LO2tvvxArU1//ztAHNPS0dAyLqo FutY1qbKxele1+mPLChGsfahVdSBr5Sc34VQDFfsWCRpOI1RqIgurUAxjKBq8jPVsa9z eGRpE/joSAeCFwJhskVvmRifP3jljvHG0NkqeibuWmPhImor478FeJTxZY/sDR0TnrLW JR3FIG4t3UHZtr9ZdVBXzhy/GcAhHiit17tvjv8+GyefDKnYjvH8aLsrbWtJ0+qhbKeO WorRjodaGkPtKz6by+y2szqc1O748Zb9j29GPKvbE1DBuFDp6wmD/vymDAuVVt+nHzm0 3vtg== X-Gm-Message-State: APjAAAXjw+8x/FZuyh/9ppYRVfnLbddQn6nh+bDRmwcHytK4hXq8IrBQ aOT0wSLVcyGVVdK4YiW/aaaF9A== X-Google-Smtp-Source: APXvYqxDCuD9IVb9t3S3rGH4Y9Oz7ptzoyvBZqNsgpOzpElb+EU0ZowiBrYWJ5I1PdvNnIBlRp+7nw== X-Received: by 2002:aa7:93c1:: with SMTP id y1mr2894684pff.200.1576689374963; Wed, 18 Dec 2019 09:16:14 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id t30sm3894117pgl.75.2019.12.18.09.16.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2019 09:16:13 -0800 (PST) Date: Wed, 18 Dec 2019 09:16:12 -0800 From: Kees Cook To: Paul Burton Cc: linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH] MIPS: BPF: Use sizeof_field() instead of FIELD_SIZEOF() Message-ID: <201912180915.9878694B@keescook> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org The FIELD_SIZEOF() macro was redundant, and is being removed from the kernel. Since commit c593642c8be0 ("treewide: Use sizeof_field() macro") this is one of the last users of the old macro, so replace it. Signed-off-by: Kees Cook --- arch/mips/net/bpf_jit.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/mips/net/bpf_jit.c b/arch/mips/net/bpf_jit.c index 3a0e34f4e615..0af88622c619 100644 --- a/arch/mips/net/bpf_jit.c +++ b/arch/mips/net/bpf_jit.c @@ -689,7 +689,7 @@ static int build_body(struct jit_ctx *ctx) emit_load_imm(r_A, k, ctx); break; case BPF_LD | BPF_W | BPF_LEN: - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, len) != 4); + BUILD_BUG_ON(sizeof_field(struct sk_buff, len) != 4); /* A <- len ==> lw r_A, offset(skb) */ ctx->flags |= SEEN_SKB | SEEN_A; off = offsetof(struct sk_buff, len); @@ -1093,7 +1093,7 @@ static int build_body(struct jit_ctx *ctx) case BPF_ANC | SKF_AD_PROTOCOL: /* A = ntohs(skb->protocol */ ctx->flags |= SEEN_SKB | SEEN_OFF | SEEN_A; - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, + BUILD_BUG_ON(sizeof_field(struct sk_buff, protocol) != 2); off = offsetof(struct sk_buff, protocol); emit_half_load(r_A, r_skb, off, ctx); @@ -1118,7 +1118,7 @@ static int build_body(struct jit_ctx *ctx) case BPF_ANC | SKF_AD_CPU: ctx->flags |= SEEN_A | SEEN_OFF; /* A = current_thread_info()->cpu */ - BUILD_BUG_ON(FIELD_SIZEOF(struct thread_info, + BUILD_BUG_ON(sizeof_field(struct thread_info, cpu) != 4); off = offsetof(struct thread_info, cpu); /* $28/gp points to the thread_info struct */ @@ -1137,30 +1137,30 @@ static int build_body(struct jit_ctx *ctx) b_imm(prog->len, ctx), ctx); emit_reg_move(r_ret, r_zero, ctx); if (code == (BPF_ANC | SKF_AD_IFINDEX)) { - BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, ifindex) != 4); + BUILD_BUG_ON(sizeof_field(struct net_device, ifindex) != 4); off = offsetof(struct net_device, ifindex); emit_load(r_A, r_s0, off, ctx); } else { /* (code == (BPF_ANC | SKF_AD_HATYPE) */ - BUILD_BUG_ON(FIELD_SIZEOF(struct net_device, type) != 2); + BUILD_BUG_ON(sizeof_field(struct net_device, type) != 2); off = offsetof(struct net_device, type); emit_half_load_unsigned(r_A, r_s0, off, ctx); } break; case BPF_ANC | SKF_AD_MARK: ctx->flags |= SEEN_SKB | SEEN_A; - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, mark) != 4); + BUILD_BUG_ON(sizeof_field(struct sk_buff, mark) != 4); off = offsetof(struct sk_buff, mark); emit_load(r_A, r_skb, off, ctx); break; case BPF_ANC | SKF_AD_RXHASH: ctx->flags |= SEEN_SKB | SEEN_A; - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, hash) != 4); + BUILD_BUG_ON(sizeof_field(struct sk_buff, hash) != 4); off = offsetof(struct sk_buff, hash); emit_load(r_A, r_skb, off, ctx); break; case BPF_ANC | SKF_AD_VLAN_TAG: ctx->flags |= SEEN_SKB | SEEN_A; - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, + BUILD_BUG_ON(sizeof_field(struct sk_buff, vlan_tci) != 2); off = offsetof(struct sk_buff, vlan_tci); emit_half_load_unsigned(r_A, r_skb, off, ctx); @@ -1186,7 +1186,7 @@ static int build_body(struct jit_ctx *ctx) break; case BPF_ANC | SKF_AD_QUEUE: ctx->flags |= SEEN_SKB | SEEN_A; - BUILD_BUG_ON(FIELD_SIZEOF(struct sk_buff, + BUILD_BUG_ON(sizeof_field(struct sk_buff, queue_mapping) != 2); BUILD_BUG_ON(offsetof(struct sk_buff, queue_mapping) > 0xff);