From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753954AbbFATVx (ORCPT ); Mon, 1 Jun 2015 15:21:53 -0400 Received: from mail-ig0-f176.google.com ([209.85.213.176]:36053 "EHLO mail-ig0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752245AbbFATVv (ORCPT ); Mon, 1 Jun 2015 15:21:51 -0400 MIME-Version: 1.0 In-Reply-To: <20150531022744.GA31012@kroah.com> References: <1432615204-4062-1-git-send-email-ddecotig@gmail.com> <20150531022744.GA31012@kroah.com> From: David Decotigny Date: Mon, 1 Jun 2015 12:21:30 -0700 X-Google-Sender-Auth: DwThaLmJ5XViOpaaa5ysA9eHRms Message-ID: Subject: Re: [PATCH v1] staging: lustre: libcfs: add __user annotation in libcfs_ioctl_data To: Greg Kroah-Hartman Cc: Oleg Drokin , Andreas Dilger , HPDD-discuss@ml01.01.org, devel@driverdev.osuosl.org, "linux-kernel@vger.kernel.org" , Doug Oucharek , Peng Tao , Isaac Huang , Amir Shehata , Liang Zhen Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Thanks for reviewing. The 2 struct members were not marked as __user, which this patch does here. This was causing warnings with copy from/to user (see commit description). This patch also propagates the annotation to the couple of functions that are using those members. On Sat, May 30, 2015 at 7:27 PM, Greg Kroah-Hartman wrote: > On Mon, May 25, 2015 at 09:40:04PM -0700, David Decotigny wrote: >> This fixes the following sparse warnings: >> drivers/staging/lustre/lnet/lnet/api-ni.c:1926:38: warning: incorrect type in argument 1 (different address spaces) >> drivers/staging/lustre/lnet/lnet/api-ni.c:1926:38: expected void [noderef] *to >> drivers/staging/lustre/lnet/lnet/api-ni.c:1926:38: got struct lnet_process_id_t [usertype] * >> drivers/staging/lustre/lnet/selftest/conctl.c:833:37: warning: incorrect type in argument 2 (different address spaces) >> drivers/staging/lustre/lnet/selftest/conctl.c:833:37: expected void const [noderef] *from >> drivers/staging/lustre/lnet/selftest/conctl.c:833:37: got char *ioc_pbuf1 >> drivers/staging/lustre/lnet/selftest/conctl.c:918:30: warning: incorrect type in argument 1 (different address spaces) >> drivers/staging/lustre/lnet/selftest/conctl.c:918:30: expected void [noderef] *to >> drivers/staging/lustre/lnet/selftest/conctl.c:918:30: got char *ioc_pbuf2 >> >> Signed-off-by: David Decotigny >> --- >> drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h | 4 ++-- >> drivers/staging/lustre/include/linux/lnet/lib-lnet.h | 2 +- >> drivers/staging/lustre/lnet/lnet/api-ni.c | 5 +++-- >> 3 files changed, 6 insertions(+), 5 deletions(-) >> >> diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h >> index 3ee3878..aa687b7 100644 >> --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h >> +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h >> @@ -61,9 +61,9 @@ struct libcfs_ioctl_data { >> char *ioc_inlbuf2; >> >> __u32 ioc_plen1; /* buffers in userspace */ >> - char *ioc_pbuf1; >> + char __user *ioc_pbuf1; >> __u32 ioc_plen2; /* buffers in userspace */ >> - char *ioc_pbuf2; >> + char __user *ioc_pbuf2; >> >> char ioc_bulk[0]; >> }; >> diff --git a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h >> index 0038d29..7f06b9f7 100644 >> --- a/drivers/staging/lustre/include/linux/lnet/lib-lnet.h >> +++ b/drivers/staging/lustre/include/linux/lnet/lib-lnet.h >> @@ -858,7 +858,7 @@ void lnet_swap_pinginfo(lnet_ping_info_t *info); >> int lnet_ping_target_init(void); >> void lnet_ping_target_fini(void); >> int lnet_ping(lnet_process_id_t id, int timeout_ms, >> - lnet_process_id_t *ids, int n_ids); >> + lnet_process_id_t __user *ids, int n_ids); >> >> int lnet_parse_ip2nets(char **networksp, char *ip2nets); >> int lnet_parse_routes(char *route_str, int *im_a_router); >> diff --git a/drivers/staging/lustre/lnet/lnet/api-ni.c b/drivers/staging/lustre/lnet/lnet/api-ni.c >> index 4a14e51..1a0cd57 100644 >> --- a/drivers/staging/lustre/lnet/lnet/api-ni.c >> +++ b/drivers/staging/lustre/lnet/lnet/api-ni.c >> @@ -1470,7 +1470,7 @@ LNetCtl(unsigned int cmd, void *arg) >> id.nid = data->ioc_nid; >> id.pid = data->ioc_u32[0]; >> rc = lnet_ping(id, data->ioc_u32[1], /* timeout */ >> - (lnet_process_id_t *)data->ioc_pbuf1, >> + (lnet_process_id_t __user *)data->ioc_pbuf1, > > Why is this marking needed? If so, something must be wrong as isn't > this variable already __user now due to the other part of this patch? > > thanks, > > greg k-h