From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Luis Chamberlain <mcgrof@kernel.org>,
Kees Cook <keescook@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: [PATCH v2 3/5] params: Use size_add() for kmalloc()
Date: Mon, 2 Oct 2023 15:48:54 +0300 [thread overview]
Message-ID: <20231002124856.2455696-4-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20231002124856.2455696-1-andriy.shevchenko@linux.intel.com>
Prevent allocations from integer overflow by using size_add().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
kernel/params.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/params.c b/kernel/params.c
index f8e3c4139854..c3a029fe183d 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -11,6 +11,7 @@
#include <linux/moduleparam.h>
#include <linux/device.h>
#include <linux/err.h>
+#include <linux/overflow.h>
#include <linux/slab.h>
#include <linux/ctype.h>
#include <linux/security.h>
@@ -48,7 +49,7 @@ static void *kmalloc_parameter(unsigned int size)
{
struct kmalloced_param *p;
- p = kmalloc(sizeof(*p) + size, GFP_KERNEL);
+ p = kmalloc(size_add(sizeof(*p), size), GFP_KERNEL);
if (!p)
return NULL;
--
2.40.0.1.gaa8946217a0b
next prev parent reply other threads:[~2023-10-02 12:49 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-02 12:48 [PATCH v2 0/5] params: harden string ops and allocatio ops Andy Shevchenko
2023-10-02 12:48 ` [PATCH v2 1/5] params: Introduce the param_unknown_fn type Andy Shevchenko
2023-10-02 12:48 ` [PATCH v2 2/5] params: Do not go over the limit when getting the string length Andy Shevchenko
2023-10-02 16:57 ` Kees Cook
2023-10-02 12:48 ` Andy Shevchenko [this message]
2023-10-02 12:48 ` [PATCH v2 4/5] params: Sort headers Andy Shevchenko
2023-10-02 12:48 ` [PATCH v2 5/5] params: Fix multi-line comment style Andy Shevchenko
2023-10-02 16:57 ` [PATCH v2 0/5] params: harden string ops and allocatio ops Kees Cook
2023-10-10 23:21 ` Luis Chamberlain
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=20231002124856.2455696-4-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=mcgrof@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).