Received: by 2002:ac0:a5a7:0:0:0:0:0 with SMTP id m36-v6csp1415644imm; Thu, 19 Jul 2018 00:58:25 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfVSgrTCVtOs6XJcYOT5LjEQ5Y9tLmSE0n0cLyFiySeKdKc991JXLyH7WaiK/E3SQirUcfv X-Received: by 2002:a17:902:822:: with SMTP id 31-v6mr8985696plk.172.1531987105776; Thu, 19 Jul 2018 00:58:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531987105; cv=none; d=google.com; s=arc-20160816; b=mTeKx+RqD6Ml/+umz+gx7QByIznYdvgdeXPWGg4OUrs60oWYTOnHx9c06LKTKpb5pU t1/8tSafn4sHJuCZc2qGNZcTzbEgpACcmYKgedO9dL6uiCWiak+jKPb7+TfIXd/bi9rf cmeBRgt/CiPDMkqbXZchjL0GIDedo+ICC3g8UsPfhHtGwfsTJSE3OLltj9fOHTTA3DNf lYcCYiPNSVj4YwunjyGDkka8JirHnvQB8TpPb63tk1WD6SoTJnVpxkaWC5UVeYKg55n5 OumlaAZ5RtPO9fhCmtfcnsYc2Yd3JuGs1C1v1g4H1DCRFcehFXOOJXVj45VyXb5v4I8e JfFA== 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=PqzAjK2LaBs6Bw6tdTwiBJZmbN8L49pNfd6rAjIlzV0=; b=Ma7P3zwCgV0T8Hf3mwCmHxAKTtxNTzS2IeYF5PNfdOGG1PR8HpKbEqYrh3dC9ppeeD EkMPCsyiBulurrBacwKcWf3jyu5aiD7qtbTds/IDtH6TsopuNV74oWeRXgOm4ybBnxGl 2TMSpRaaG+wkiV0XwpLlAQyA/Wa4ZhVjteVAuP0MTwYmJy7wvy8nn6gwgcRSF4oitpF9 /+RBwxqQ6B1L0ChUN2p1IfumkOqU2RohZ4WN5NV35uF7MtS0vwGixGBFEopaTiLqF0Ol 83frsOLMdahDLG0cznWxaWN17SuhYRnvDZ2x9W5Lq1PVmdKGBhyx90biNxc6zYIZ8JmD dfwQ== 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 h35-v6si5454971pgl.176.2018.07.19.00.58.11; Thu, 19 Jul 2018 00:58:25 -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 S1731305AbeGSIjb (ORCPT + 99 others); Thu, 19 Jul 2018 04:39:31 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:44885 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730628AbeGSIjb (ORCPT ); Thu, 19 Jul 2018 04:39:31 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id E2182CF8BF3F5; Thu, 19 Jul 2018 15:57:28 +0800 (CST) Received: from localhost (10.177.31.96) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.382.0; Thu, 19 Jul 2018 15:57:22 +0800 From: YueHaibing To: , CC: , , YueHaibing Subject: [PATCH v2 bpf-next] bpfilter: Fix mismatch in function argument types Date: Thu, 19 Jul 2018 15:56:59 +0800 Message-ID: <20180719075659.9800-1-yuehaibing@huawei.com> X-Mailer: git-send-email 2.10.2.windows.1 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.177.31.96] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Fix following warning: net/ipv4/bpfilter/sockopt.c:28:5: error: symbol 'bpfilter_ip_set_sockopt' redeclared with different type net/ipv4/bpfilter/sockopt.c:34:5: error: symbol 'bpfilter_ip_get_sockopt' redeclared with different type Signed-off-by: YueHaibing --- include/linux/bpfilter.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/bpfilter.h b/include/linux/bpfilter.h index 687b176..f02cee0 100644 --- a/include/linux/bpfilter.h +++ b/include/linux/bpfilter.h @@ -5,10 +5,10 @@ #include struct sock; -int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char *optval, +int bpfilter_ip_set_sockopt(struct sock *sk, int optname, char __user *optval, unsigned int optlen); -int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char *optval, - int *optlen); +int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval, + int __user *optlen); extern int (*bpfilter_process_sockopt)(struct sock *sk, int optname, char __user *optval, unsigned int optlen, bool is_set); -- 2.7.0