iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IB/uverbs: clean up INIT_UDATA_BUF_OR_NULL usage

Browse Source 
We get a harmless warning about the fact that we use the result of a
multiplication as a condition:

drivers/infiniband/core/uverbs_main.c: In function 'ib_uverbs_write':
drivers/infiniband/core/uverbs_main.c:787:40: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
drivers/infiniband/core/uverbs_main.c:787:117: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
drivers/infiniband/core/uverbs_main.c:790:50: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]
drivers/infiniband/core/uverbs_main.c:790:151: error: '*' in boolean context, suggest '&&' instead [-Werror=int-in-bool-context]

This avoids the problem by using an inline function in place of
the macro.

Fixes: a96e4e2ffe ("IB/uverbs: New macro to set pointers to NULL if length is 0 in INIT_UDATA()")
Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://patchwork.kernel.org/patch/9940777/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Arnd Bergmann 2017-09-06 23:34:25 +02:00 committed by Doug Ledford
parent be92d4891f
commit 12f727721e
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/infiniband/core/uverbs.h
View File

@ -55,13 +55,14 @@
(udata)->outlen = (olen); \ (udata)->outlen = (olen); \
} while (0) } while (0)
#define INIT_UDATA_BUF_OR_NULL(udata, ibuf, obuf, ilen, olen) \ static inline void
do { \ ib_uverbs_init_udata_buf_or_null(struct ib_udata *udata,
(udata)->inbuf = (ilen) ? (const void __user *) (ibuf) : NULL; \ const void __user *ibuf,
(udata)->outbuf = (olen) ? (void __user *) (obuf) : NULL; \ void __user *obuf,
(udata)->inlen = (ilen); \ size_t ilen, size_t olen)
(udata)->outlen = (olen); \ {
} while (0) INIT_UDATA(udata, ilen ? ibuf : NULL, olen ? obuf : NULL, ilen, olen);
}
/* /*
* Our lifetime rules for these structs are the following: * Our lifetime rules for these structs are the following:

22
drivers/infiniband/core/uverbs_main.c
View File

@ -763,7 +763,7 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
} }
if (!access_ok(VERIFY_WRITE, if (!access_ok(VERIFY_WRITE,
(void __user *) (unsigned long) ex_hdr.response, u64_to_user_ptr(ex_hdr.response),
(hdr.out_words + ex_hdr.provider_out_words) * 8)) { (hdr.out_words + ex_hdr.provider_out_words) * 8)) {
ret = -EFAULT; ret = -EFAULT;
goto out; goto out;
@ -775,19 +775,17 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf,
} }
} }
INIT_UDATA_BUF_OR_NULL(&ucore, buf, (unsigned long) ex_hdr.response, ib_uverbs_init_udata_buf_or_null(&ucore, buf,
hdr.in_words * 8, hdr.out_words * 8); u64_to_user_ptr(ex_hdr.response),
hdr.in_words * 8, hdr.out_words * 8);
INIT_UDATA_BUF_OR_NULL(&uhw, ib_uverbs_init_udata_buf_or_null(&uhw,
buf + ucore.inlen, buf + ucore.inlen,
(unsigned long) ex_hdr.response + ucore.outlen, u64_to_user_ptr(ex_hdr.response) + ucore.outlen,
ex_hdr.provider_in_words * 8, ex_hdr.provider_in_words * 8,
ex_hdr.provider_out_words * 8); ex_hdr.provider_out_words * 8);
ret = uverbs_ex_cmd_table[command](file, ret = uverbs_ex_cmd_table[command](file, ib_dev, &ucore, &uhw);
ib_dev,
&ucore,
&uhw);
if (!ret) if (!ret)
ret = written_count; ret = written_count;
} else { } else {

3
drivers/infiniband/core/uverbs_std_types.c
View File

@ -246,7 +246,8 @@ static void create_udata(struct uverbs_attr_bundle *ctx,
outbuf_len = uhw_out->ptr_attr.len; outbuf_len = uhw_out->ptr_attr.len;
} }
INIT_UDATA_BUF_OR_NULL(udata, inbuf, outbuf, inbuf_len, outbuf_len); ib_uverbs_init_udata_buf_or_null(udata, inbuf, outbuf, inbuf_len,
outbuf_len);
} }
static int uverbs_create_cq_handler(struct ib_device *ib_dev, static int uverbs_create_cq_handler(struct ib_device *ib_dev,