From: Dan Carpenter <dan.carpenter@linaro.org>
To: Jeffrey Hugo <quic_jhugo@quicinc.com>
Cc: Carl Vanderlip <quic_carlv@quicinc.com>,
Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>,
Oded Gabbay <ogabbay@kernel.org>,
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>,
linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org,
kernel-janitors@vger.kernel.org
Subject: [PATCH 5/5 v3] accel/qaic: Fix a leak in map_user_pages()
Date: Tue, 11 Jul 2023 09:13:08 +0300 [thread overview]
Message-ID: <8666cc78-3e15-435e-9c4e-15502ac75bcd@moroto.mountain> (raw)
In-Reply-To: <ZKzx5nA6Z/0yhBJj@moroto>
If get_user_pages_fast() allocates some pages but not as many as we
wanted, then the current code leaks those pages. Call put_page() on
the pages before returning.
Fixes: 129776ac2e38 ("accel/qaic: Add control path")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
no change
drivers/accel/qaic/qaic_control.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/accel/qaic/qaic_control.c b/drivers/accel/qaic/qaic_control.c
index d5ce36cb351f..9a6f80f31c65 100644
--- a/drivers/accel/qaic/qaic_control.c
+++ b/drivers/accel/qaic/qaic_control.c
@@ -425,9 +425,12 @@ static int find_and_map_user_pages(struct qaic_device *qdev,
}
ret = get_user_pages_fast(xfer_start_addr, nr_pages, 0, page_list);
- if (ret < 0 || ret != nr_pages) {
- ret = -EFAULT;
+ if (ret < 0)
goto free_page_list;
+ if (ret != nr_pages) {
+ nr_pages = ret;
+ ret = -EFAULT;
+ goto put_pages;
}
sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
--
2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Dan Carpenter <dan.carpenter@linaro.org>
To: Jeffrey Hugo <quic_jhugo@quicinc.com>
Cc: linux-arm-msm@vger.kernel.org, Oded Gabbay <ogabbay@kernel.org>,
kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org,
Pranjal Ramajor Asha Kanojiya <quic_pkanojiy@quicinc.com>,
Carl Vanderlip <quic_carlv@quicinc.com>,
Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Subject: [PATCH 5/5 v3] accel/qaic: Fix a leak in map_user_pages()
Date: Tue, 11 Jul 2023 09:13:08 +0300 [thread overview]
Message-ID: <8666cc78-3e15-435e-9c4e-15502ac75bcd@moroto.mountain> (raw)
In-Reply-To: <ZKzx5nA6Z/0yhBJj@moroto>
If get_user_pages_fast() allocates some pages but not as many as we
wanted, then the current code leaks those pages. Call put_page() on
the pages before returning.
Fixes: 129776ac2e38 ("accel/qaic: Add control path")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
no change
drivers/accel/qaic/qaic_control.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/accel/qaic/qaic_control.c b/drivers/accel/qaic/qaic_control.c
index d5ce36cb351f..9a6f80f31c65 100644
--- a/drivers/accel/qaic/qaic_control.c
+++ b/drivers/accel/qaic/qaic_control.c
@@ -425,9 +425,12 @@ static int find_and_map_user_pages(struct qaic_device *qdev,
}
ret = get_user_pages_fast(xfer_start_addr, nr_pages, 0, page_list);
- if (ret < 0 || ret != nr_pages) {
- ret = -EFAULT;
+ if (ret < 0)
goto free_page_list;
+ if (ret != nr_pages) {
+ nr_pages = ret;
+ ret = -EFAULT;
+ goto put_pages;
}
sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
--
2.39.2
next prev parent reply other threads:[~2023-07-11 6:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-11 6:08 [PATCH 0/5 v3] accel/qaic: Improve bounds checking in encode/decode Dan Carpenter
2023-07-11 6:08 ` Dan Carpenter
2023-07-11 6:10 ` [PATCH 1/5 v3] accel/qaic: tighten bounds checking in encode_message() Dan Carpenter
2023-07-11 6:10 ` Dan Carpenter
2023-07-11 6:20 ` Dan Carpenter
2023-07-11 6:20 ` Dan Carpenter
2023-07-11 6:12 ` [PATCH 2/5 v3] accel/qaic: tighten bounds checking in decode_message() Dan Carpenter
2023-07-11 6:12 ` Dan Carpenter
2023-07-11 6:12 ` [PATCH 3/5 v3] accel/qaic: Add consistent integer overflow checks Dan Carpenter
2023-07-11 6:12 ` Dan Carpenter
2023-07-11 6:13 ` Dan Carpenter [this message]
2023-07-11 6:13 ` [PATCH 5/5 v3] accel/qaic: Fix a leak in map_user_pages() Dan Carpenter
2023-07-11 7:23 ` Dafna Hirschfeld
2023-07-11 7:23 ` Dafna Hirschfeld
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=8666cc78-3e15-435e-9c4e-15502ac75bcd@moroto.mountain \
--to=dan.carpenter@linaro.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=jacek.lawrynowicz@linux.intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=ogabbay@kernel.org \
--cc=quic_carlv@quicinc.com \
--cc=quic_jhugo@quicinc.com \
--cc=quic_pkanojiy@quicinc.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.