From: "tip-bot2 for Adrian Huang" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Adrian Huang <ahuang12@lenovo.com>, Borislav Petkov <bp@suse.de>,
Christoph Hellwig <hch@lst.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/mm: Refine mmap syscall implementation
Date: Tue, 05 Jan 2021 18:28:07 -0000 [thread overview]
Message-ID: <160987128790.414.308593720085652897.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201217052648.24656-1-adrianhuang0701@gmail.com>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 91a8f6cb06b33adc79fbf5f7381d907485767c00
Gitweb: https://git.kernel.org/tip/91a8f6cb06b33adc79fbf5f7381d907485767c00
Author: Adrian Huang <ahuang12@lenovo.com>
AuthorDate: Thu, 17 Dec 2020 13:26:48 +08:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Tue, 05 Jan 2021 19:07:42 +01:00
x86/mm: Refine mmap syscall implementation
It is unnecessary to use the local variable 'error' in the mmap syscall
implementation function - just return -EINVAL directly and get rid of
the local variable altogether.
[ bp: Massage commit message. ]
Signed-off-by: Adrian Huang <ahuang12@lenovo.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lkml.kernel.org/r/20201217052648.24656-1-adrianhuang0701@gmail.com
---
arch/x86/kernel/sys_x86_64.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 504fa54..660b788 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -90,14 +90,10 @@ SYSCALL_DEFINE6(mmap, unsigned long, addr, unsigned long, len,
unsigned long, prot, unsigned long, flags,
unsigned long, fd, unsigned long, off)
{
- long error;
- error = -EINVAL;
if (off & ~PAGE_MASK)
- goto out;
+ return -EINVAL;
- error = ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
-out:
- return error;
+ return ksys_mmap_pgoff(addr, len, prot, flags, fd, off >> PAGE_SHIFT);
}
static void find_start_end(unsigned long addr, unsigned long flags,
prev parent reply other threads:[~2021-01-05 18:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 5:26 [PATCH 1/1] x86/mm: Refine mmap syscall implementation Adrian Huang
2020-12-22 14:51 ` Christoph Hellwig
2021-01-05 18:28 ` tip-bot2 for Adrian Huang [this message]
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=160987128790.414.308593720085652897.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=ahuang12@lenovo.com \
--cc=bp@suse.de \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@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).