From: "Luis R. Rodriguez" <mcgrof@kernel.org>
To: Waiman Long <longman@redhat.com>
Cc: "Luis R. Rodriguez" <mcgrof@kernel.org>,
Kees Cook <keescook@chromium.org>,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Matthew Wilcox <willy@infradead.org>
Subject: Re: [PATCH v3 6/6] ipc: Clamp semmni to the real IPCMNI limit
Date: Thu, 8 Mar 2018 18:15:29 +0000 [thread overview]
Message-ID: <20180308181529.GG4449@wotan.suse.de> (raw)
In-Reply-To: <1519926220-7453-7-git-send-email-longman@redhat.com>
On Thu, Mar 01, 2018 at 12:43:40PM -0500, Waiman Long wrote:
> This patch clamps the semmni value (fourth element of sem_ctls[]
> array) to within the [0, IPCMNI] range and prints a warning message
> once when an out-of-range value is being written.
>
> Signed-off-by: Waiman Long <longman@redhat.com>
> ---
> ipc/ipc_sysctl.c | 13 ++++++++++++-
> ipc/sem.c | 28 ++++++++++++++++++++++++++++
> ipc/util.h | 4 ++++
> 3 files changed, 44 insertions(+), 1 deletion(-)
>
> diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
> index 8eb7268..2c03f57 100644
> --- a/ipc/ipc_sysctl.c
> +++ b/ipc/ipc_sysctl.c
> @@ -97,12 +97,22 @@ static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
> return proc_dointvec_minmax(&ipc_table, write, buffer, lenp, ppos);
> }
>
> +static int proc_ipc_sem_dointvec(struct ctl_table *table, int write,
> + void __user *buffer, size_t *lenp, loff_t *ppos)
> +{
> + int ret = proc_ipc_dointvec(table, write, buffer, lenp, ppos);
> +
> + sem_check_semmni(table, current->nsproxy->ipc_ns);
> + return ret;
> +}
> +
> #else
> #define proc_ipc_doulongvec_minmax NULL
> #define proc_ipc_dointvec NULL
> #define proc_ipc_dointvec_minmax NULL
> #define proc_ipc_dointvec_minmax_orphans NULL
> #define proc_ipc_auto_msgmni NULL
> +#define proc_ipc_sem_dointvec NULL
> #endif
>
> static int zero;
> @@ -186,7 +196,8 @@ static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
> .data = &init_ipc_ns.sem_ctls,
> .maxlen = 4*sizeof(int),
> .mode = 0644,
> - .proc_handler = proc_ipc_dointvec,
> + .proc_handler = proc_ipc_sem_dointvec,
> + .flags = CTL_FLAGS_CLAMP_RANGE,
> },
> #ifdef CONFIG_CHECKPOINT_RESTORE
> {
> diff --git a/ipc/sem.c b/ipc/sem.c
> index a4af049..739dfca 100644
> --- a/ipc/sem.c
> +++ b/ipc/sem.c
> @@ -2337,3 +2337,31 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
> return 0;
> }
> #endif
> +
> +#ifdef CONFIG_PROC_SYSCTL
> +/*
> + * Check to see if semmni is out of range and clamp it if necessary.
> + */
> +void sem_check_semmni(struct ctl_table *table, struct ipc_namespace *ns)
> +{
> + bool clamped = false;
> +
> + if (!(table->flags & CTL_FLAGS_CLAMP_RANGE))
> + return;
> +
> + /*
> + * Clamp semmni to the range [0, IPCMNI].
> + */
> + if (ns->sc_semmni < 0) {
> + ns->sc_semmni = 0;
> + clamped = true;
> + }
> + if (ns->sc_semmni > IPCMNI) {
> + ns->sc_semmni = IPCMNI;
> + clamped = true;
> + }
> + if (clamped)
> + pr_warn_once("Kernel parameter \"sem[3]\" was set out of range [%d, %d], clamped to %d.\n",
> + 0, IPCMNI, ns->sc_semmni);
Why are the users issuing a warning, wouldn't the API do the warning
on its own, specially since we're adding a warn flag?
Luis
next prev parent reply other threads:[~2018-03-08 18:15 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-01 17:43 [PATCH v3 0/6] ipc: Clamp *mni to the real IPCMNI limit Waiman Long
2018-03-01 17:43 ` [PATCH v3 1/6] proc/sysctl: Fix typo in sysctl_check_table_array() Waiman Long
2018-03-08 17:51 ` Luis R. Rodriguez
2018-03-01 17:43 ` [PATCH v3 2/6] sysctl: Add kdoc comments to do_proc_do{u}intvec_minmax_conv_param Waiman Long
2018-03-08 17:52 ` Luis R. Rodriguez
2018-03-01 17:43 ` [PATCH v3 3/6] sysctl: Add flags to support min/max range clamping Waiman Long
2018-03-01 21:31 ` Andrew Morton
2018-03-01 21:54 ` Waiman Long
2018-03-08 17:51 ` Luis R. Rodriguez
2018-03-08 17:57 ` Luis R. Rodriguez
2018-03-08 19:35 ` Waiman Long
2018-03-08 20:45 ` Luis R. Rodriguez
2018-03-08 21:41 ` Waiman Long
2018-03-08 19:30 ` Waiman Long
2018-03-01 17:43 ` [PATCH v3 4/6] sysctl: Warn when a clamped sysctl parameter is set out of range Waiman Long
2018-03-01 21:38 ` Andrew Morton
2018-03-01 22:22 ` Waiman Long
2018-03-08 18:11 ` Luis R. Rodriguez
2018-03-08 19:37 ` Waiman Long
2018-03-08 18:31 ` Luis R. Rodriguez
2018-03-08 19:57 ` Waiman Long
2018-03-08 20:49 ` Luis R. Rodriguez
2018-03-08 21:40 ` Waiman Long
2018-03-08 22:06 ` Luis R. Rodriguez
2018-03-01 17:43 ` [PATCH v3 5/6] ipc: Clamp msgmni and shmmni to the real IPCMNI limit Waiman Long
2018-03-08 18:14 ` Luis R. Rodriguez
2018-03-01 17:43 ` [PATCH v3 6/6] ipc: Clamp semmni " Waiman Long
2018-03-08 18:15 ` Luis R. Rodriguez [this message]
2018-03-08 20:02 ` Waiman Long
2018-03-08 18:23 ` [PATCH v3 0/6] ipc: Clamp *mni " Luis R. Rodriguez
2018-03-08 18:38 ` Luis R. Rodriguez
2018-03-08 19:22 ` Waiman Long
2018-03-08 19:02 ` Waiman Long
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=20180308181529.GG4449@wotan.suse.de \
--to=mcgrof@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=keescook@chromium.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=longman@redhat.com \
--cc=viro@zeniv.linux.org.uk \
--cc=willy@infradead.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).