瀏覽代碼

IB/uverbs: Use inline data transfer for UHW_IN

The rule for the API is pointers less than 8 bytes are inlined into
the .data field of the attribute. Fix the creation of the driver udata
struct to follow this rule and point to the .data itself when the size
is less than 8 bytes.

Otherwise if the UHW struct is less than 8 bytes the driver will get
EFAULT during copy_from_user.

Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Jason Gunthorpe 7 年之前
父節點
當前提交
6c976c30ad
共有 1 個文件被更改,包括 4 次插入1 次删除
  1. 4 1
      drivers/infiniband/core/uverbs_std_types.c

+ 4 - 1
drivers/infiniband/core/uverbs_std_types.c

@@ -234,8 +234,11 @@ static void create_udata(struct uverbs_attr_bundle *ctx,
 		uverbs_attr_get(ctx, UVERBS_UHW_OUT);
 		uverbs_attr_get(ctx, UVERBS_UHW_OUT);
 
 
 	if (!IS_ERR(uhw_in)) {
 	if (!IS_ERR(uhw_in)) {
-		udata->inbuf = uhw_in->ptr_attr.ptr;
 		udata->inlen = uhw_in->ptr_attr.len;
 		udata->inlen = uhw_in->ptr_attr.len;
+		if (uverbs_attr_ptr_is_inline(uhw_in))
+			udata->inbuf = &uhw_in->uattr->data;
+		else
+			udata->inbuf = uhw_in->ptr_attr.ptr;
 	} else {
 	} else {
 		udata->inbuf = NULL;
 		udata->inbuf = NULL;
 		udata->inlen = 0;
 		udata->inlen = 0;