From: akpm@linux-foundation.org To: dave@stgolabs.net, dbueso@suse.de, manfred@colorfullife.com, mm-commits@vger.kernel.org Subject: + ipc-shm-some-shmat-cleanups.patch added to -mm tree Date: Tue, 04 Apr 2017 13:40:59 -0700 [thread overview] Message-ID: <58e404db.+PK/eHNdTs5CerNv%akpm@linux-foundation.org> (raw) The patch titled Subject: ipc/shm: some shmat cleanups has been added to the -mm tree. Its filename is ipc-shm-some-shmat-cleanups.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ipc-shm-some-shmat-cleanups.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ipc-shm-some-shmat-cleanups.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Davidlohr Bueso <dave@stgolabs.net> Subject: ipc/shm: some shmat cleanups Clean up early flag and address some minutia. Link: http://lkml.kernel.org/r/1486673582-6979-3-git-send-email-dave@stgolabs.net Signed-off-by: Davidlohr Bueso <dbueso@suse.de> Cc: Manfred Spraul <manfred@colorfullife.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- ipc/shm.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff -puN ipc/shm.c~ipc-shm-some-shmat-cleanups ipc/shm.c --- a/ipc/shm.c~ipc-shm-some-shmat-cleanups +++ a/ipc/shm.c @@ -1095,11 +1095,11 @@ long do_shmat(int shmid, char __user *sh ulong *raddr, unsigned long shmlba) { struct shmid_kernel *shp; - unsigned long addr; + unsigned long addr = (unsigned long)shmaddr; unsigned long size; struct file *file; int err; - unsigned long flags; + unsigned long flags = MAP_SHARED; unsigned long prot; int acc_mode; struct ipc_namespace *ns; @@ -1111,7 +1111,8 @@ long do_shmat(int shmid, char __user *sh err = -EINVAL; if (shmid < 0) goto out; - else if ((addr = (ulong)shmaddr)) { + + if (addr) { if (addr & (shmlba - 1)) { /* * Round down to the nearest multiple of shmlba. @@ -1126,13 +1127,10 @@ long do_shmat(int shmid, char __user *sh #endif goto out; } - flags = MAP_SHARED | MAP_FIXED; - } else { - if ((shmflg & SHM_REMAP)) - goto out; - flags = MAP_SHARED; - } + flags |= MAP_FIXED; + } else if ((shmflg & SHM_REMAP)) + goto out; if (shmflg & SHM_RDONLY) { prot = PROT_READ; _ Patches currently in -mm which might be from dave@stgolabs.net are ipc-shm-some-shmat-cleanups.patch sysvipc-cacheline-align-kern_ipc_perm.patch
reply other threads:[~2017-04-04 20:41 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=58e404db.+PK/eHNdTs5CerNv%akpm@linux-foundation.org \ --to=akpm@linux-foundation.org \ --cc=dave@stgolabs.net \ --cc=dbueso@suse.de \ --cc=linux-kernel@vger.kernel.org \ --cc=manfred@colorfullife.com \ --cc=mm-commits@vger.kernel.org \ --subject='Re: + ipc-shm-some-shmat-cleanups.patch added to -mm tree' \ /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
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.