From patchwork Thu Jul 13 06:27:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 107548 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp1818645qge; Wed, 12 Jul 2017 23:30:06 -0700 (PDT) X-Received: by 10.98.137.81 with SMTP id v78mr44734165pfd.9.1499927406877; Wed, 12 Jul 2017 23:30:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1499927406; cv=none; d=google.com; s=arc-20160816; b=H5N3bNC74GV1ySYYpj6IhFqxMYBgBFwyzFRD8lmkAJkVRBYx4qwO3qtLw8AJL8+aof ddG8id8mRxnCxVc4u9HVGR/c97mv9Eu9erEhMFpAmNZ7finackYbkPknO6aCkyknEufE iazOg8RgzzhlrLeXjU40BuEj9uMxj4KhvuYxIQeFKvD9c4sT62FrOsg8XnrtBNQpj2GD 9KOEPCtInq1O667OcAMuwLgblIV1msAACbwRRqwc/Nd5vcjuDadx+J9U7AStHJG41qkq 6+dZI7wd4DCxEiXarMtwce2FEwNbC2m+Uv5g9vO9UNWn19ScOcf9WPPKDXjDFy99ki0X Giig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject:cc :to:from:arc-authentication-results; bh=146VwGh3x3MGL7UHRe1hzLAgOXls0Xxs21LQIAvh27c=; b=KDQHaaDFSXi0rLfNBnNUrNXJ2+v8cuFIhbk10Sx35lbSab5DxKm8g8hOr3+BgxzF+L wk0PYQAW4pF2YqcWcLBXEiiKmcqYeShP+e86lteh8ZLEzvNfq3dxfrDI2qVd9JPE0pBw idJbnLbVVTsqBH+2WDB73dpb7M3Z5FVemV9P4yTiNtGCUfGjVhIcakPXOiAX1TpnLrqy eL+sPm+j/fZNHqk5G24tKj1EhcbCibaYvq3D2Za7TBdSsubZITDl3QHqrsg07R/MPhwO LJxkyrod19gOBXrIw8opV5RbWvLmruAF3urLs12Sf5jytAh7n/fevax/vcf7LnsuY+Ud RC0A== ARC-Authentication-Results: i=1; mx.google.com; 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 f6si3748501plj.207.2017.07.12.23.30.06; Wed, 12 Jul 2017 23:30:06 -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; 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 S1751178AbdGMG3y (ORCPT + 25 others); Thu, 13 Jul 2017 02:29:54 -0400 Received: from szxga02-in.huawei.com ([45.249.212.188]:9846 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750831AbdGMG3x (ORCPT ); Thu, 13 Jul 2017 02:29:53 -0400 Received: from 172.30.72.57 (EHLO DGGEML404-HUB.china.huawei.com) ([172.30.72.57]) by dggrg02-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id AQY75550; Thu, 13 Jul 2017 14:29:48 +0800 (CST) Received: from localhost.localdomain.localdomain (10.175.113.25) by DGGEML404-HUB.china.huawei.com (10.3.17.39) with Microsoft SMTP Server id 14.3.301.0; Thu, 13 Jul 2017 14:29:37 +0800 From: Kefeng Wang To: Alexei Starovoitov , "David S. Miller" CC: Daniel Borkmann , , , Kefeng Wang Subject: [PATCH] bpf: fix return in bpf_skb_adjust_net Date: Thu, 13 Jul 2017 14:27:58 +0800 Message-ID: <1499927278-175876-1-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020202.5967135D.00AC, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 6c8ba9f4fd1b9ea5f659f2c3d4e42b51 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The bpf_skb_adjust_net() ignores the return value of bpf_skb_net_shrink/grow, and always return 0, fix it by return 'ret'. Signed-off-by: Kefeng Wang --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.8.3.1 Acked-by: Daniel Borkmann diff --git a/net/core/filter.c b/net/core/filter.c index c7f7370..f44fc22 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2248,7 +2248,7 @@ static int bpf_skb_adjust_net(struct sk_buff *skb, s32 len_diff) bpf_skb_net_grow(skb, len_diff_abs); bpf_compute_data_end(skb); - return 0; + return ret; } BPF_CALL_4(bpf_skb_adjust_room, struct sk_buff *, skb, s32, len_diff,