From: Dan Carpenter <dan.carpenter@oracle.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: Zhu Yanjun <yanjunz@mellanox.com>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
linux-rdma@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] RDMA/rxe: Return -EFAULT if copy_from_user() fails
Date: Tue, 12 May 2020 11:17:06 +0300 [thread overview]
Message-ID: <20200512081706.GJ9365@kadam> (raw)
In-Reply-To: <20200512070203.GG4814@unreal>
On Tue, May 12, 2020 at 10:02:03AM +0300, Leon Romanovsky wrote:
> On Tue, May 12, 2020 at 09:29:36AM +0300, Leon Romanovsky wrote:
> > On Mon, May 11, 2020 at 09:37:42PM +0300, Dan Carpenter wrote:
> > > This function used to always return -EINVAL but we updated it to try
> > > preserve the error codes. Unfortunately the copy_to_user() is returning
> > > the number of bytes remaining to be copied instead of a negative error
> > > code.
> > >
> > > Fixes: a3a974b4654d ("RDMA/rxe: Always return ERR_PTR from rxe_create_mmap_info()")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > ---
> > > drivers/infiniband/sw/rxe/rxe_queue.c | 5 +++--
> > > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> >
> > Thanks,
> > Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
>
> Actually Yanjun is right and "err" can be removed.
>
> Thanks
I don't know if the code you guys are looking at is older or newer than
linux-next... :P
drivers/infiniband/sw/rxe/rxe_queue.c
39 int do_mmap_info(struct rxe_dev *rxe, struct mminfo __user *outbuf,
40 struct ib_udata *udata, struct rxe_queue_buf *buf,
41 size_t buf_size, struct rxe_mmap_info **ip_p)
42 {
43 int err;
^^^
44 struct rxe_mmap_info *ip = NULL;
45
46 if (outbuf) {
47 ip = rxe_create_mmap_info(rxe, buf_size, udata, buf);
48 if (IS_ERR(ip)) {
49 err = PTR_ERR(ip);
50 goto err1;
^^^^^^^^^
51 }
52
53 err = copy_to_user(outbuf, &ip->info, sizeof(ip->info));
54 if (err)
55 goto err2;
^^^^^^^^^
56
57 spin_lock_bh(&rxe->pending_lock);
58 list_add(&ip->pending_mmaps, &rxe->pending_mmaps);
59 spin_unlock_bh(&rxe->pending_lock);
60 }
61
62 *ip_p = ip;
63
64 return 0;
65
66 err2:
67 kfree(ip);
68 err1:
69 return err;
^^^
70 }
regards,
dan carpenter
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Leon Romanovsky <leon@kernel.org>
Cc: Zhu Yanjun <yanjunz@mellanox.com>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
linux-rdma@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] RDMA/rxe: Return -EFAULT if copy_from_user() fails
Date: Tue, 12 May 2020 08:17:06 +0000 [thread overview]
Message-ID: <20200512081706.GJ9365@kadam> (raw)
In-Reply-To: <20200512070203.GG4814@unreal>
On Tue, May 12, 2020 at 10:02:03AM +0300, Leon Romanovsky wrote:
> On Tue, May 12, 2020 at 09:29:36AM +0300, Leon Romanovsky wrote:
> > On Mon, May 11, 2020 at 09:37:42PM +0300, Dan Carpenter wrote:
> > > This function used to always return -EINVAL but we updated it to try
> > > preserve the error codes. Unfortunately the copy_to_user() is returning
> > > the number of bytes remaining to be copied instead of a negative error
> > > code.
> > >
> > > Fixes: a3a974b4654d ("RDMA/rxe: Always return ERR_PTR from rxe_create_mmap_info()")
> > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> > > ---
> > > drivers/infiniband/sw/rxe/rxe_queue.c | 5 +++--
> > > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> >
> > Thanks,
> > Reviewed-by: Leon Romanovsky <leonro@mellanox.com>
>
> Actually Yanjun is right and "err" can be removed.
>
> Thanks
I don't know if the code you guys are looking at is older or newer than
linux-next... :P
drivers/infiniband/sw/rxe/rxe_queue.c
39 int do_mmap_info(struct rxe_dev *rxe, struct mminfo __user *outbuf,
40 struct ib_udata *udata, struct rxe_queue_buf *buf,
41 size_t buf_size, struct rxe_mmap_info **ip_p)
42 {
43 int err;
^^^
44 struct rxe_mmap_info *ip = NULL;
45
46 if (outbuf) {
47 ip = rxe_create_mmap_info(rxe, buf_size, udata, buf);
48 if (IS_ERR(ip)) {
49 err = PTR_ERR(ip);
50 goto err1;
^^^^^^^^^
51 }
52
53 err = copy_to_user(outbuf, &ip->info, sizeof(ip->info));
54 if (err)
55 goto err2;
^^^^^^^^^
56
57 spin_lock_bh(&rxe->pending_lock);
58 list_add(&ip->pending_mmaps, &rxe->pending_mmaps);
59 spin_unlock_bh(&rxe->pending_lock);
60 }
61
62 *ip_p = ip;
63
64 return 0;
65
66 err2:
67 kfree(ip);
68 err1:
69 return err;
^^^
70 }
regards,
dan carpenter
next prev parent reply other threads:[~2020-05-12 8:17 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-11 18:37 [PATCH] RDMA/rxe: Return -EFAULT if copy_from_user() fails Dan Carpenter
2020-05-11 18:37 ` Dan Carpenter
2020-05-12 1:12 ` Yanjun Zhu
2020-05-12 6:22 ` Leon Romanovsky
2020-05-12 6:22 ` Leon Romanovsky
2020-05-12 6:29 ` Leon Romanovsky
2020-05-12 6:29 ` Leon Romanovsky
2020-05-12 7:02 ` Leon Romanovsky
2020-05-12 7:02 ` Leon Romanovsky
2020-05-12 8:17 ` Dan Carpenter [this message]
2020-05-12 8:17 ` Dan Carpenter
2020-05-12 8:31 ` Leon Romanovsky
2020-05-12 8:31 ` Leon Romanovsky
2020-05-12 8:33 ` Yanjun Zhu
2020-05-12 14:51 ` Jason Gunthorpe
2020-05-12 14:51 ` Jason Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200512081706.GJ9365@kadam \
--to=dan.carpenter@oracle.com \
--cc=dledford@redhat.com \
--cc=jgg@ziepe.ca \
--cc=kernel-janitors@vger.kernel.org \
--cc=leon@kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=sudipm.mukherjee@gmail.com \
--cc=yanjunz@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.