All of lore.kernel.org
 help / color / mirror / Atom feed
* [pseudo][PATCH] Fix to fcntl guts to ignore flags that can be ORed into cmd
@ 2017-09-15 22:27 Will Page
  2017-09-15 22:30 ` ✗ patchtest: failure for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Will Page @ 2017-09-15 22:27 UTC (permalink / raw)
  To: openembedded-core

The fcntl guts switch on "cmd" parameter to identify the fcntl
command being issued, but isn't aware of the file creation flags that
can be ORed in.

This change masks out the flags from the command only for the switch
statement so that it can correctly determine whether it needs to pass
"lock" or "arg".  When real_fcntl() is called, the original value is
still passed on. This corrects an issue observed using pseudo on modern
linux desktops resulting in "pseudo: unknown fcntl argument 1030,
assuming long argument." diagnostics in the output.  Decimal 1030 is
0x0406, which translates to O_NOCTTY | F_SETLK, and should call
"rc = real_fcntl(fd, cmd, lock);", but instead falls through to the
default case instead calling "rc = real_fcntl(fd, cmd, arg);".

Tested the change using perftest - without this patch, the issue is
trivially reproducible on my Ubuntu Xenial system, and after patching it
emitted no "unknown fcntl argument" diagnostics.

Signed-off-by: Will Page <Will.Page@ni.com>
---
 ports/linux/guts/fcntl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/linux/guts/fcntl.c b/ports/linux/guts/fcntl.c
index 639fd24..d278a8c 100644
--- a/ports/linux/guts/fcntl.c
+++ b/ports/linux/guts/fcntl.c
@@ -8,6 +8,10 @@
  */
  	long arg;
 	int save_errno;
+	/* some bits can be ORed into the cmd should be explicitly ignored
+	 * see fcntl documentation on F_SETFL */
+	int o_mode_mask = (O_RDONLY | O_WRONLY | O_RDWR) |
+		(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
 
 	/* we don't know whether we need lock or arg; grab both, which
 	 * should be safe enough on Linuxy systems. */
@@ -15,7 +19,7 @@
 	arg = va_arg(ap, long);
 	va_end(ap);
 
-	switch (cmd) {
+	switch (cmd & ~(o_mode_mask)) {
 	case F_DUPFD:
 #ifdef F_DUPFD_CLOEXEC
 	case F_DUPFD_CLOEXEC:
-- 
2.7.4



^ permalink raw reply related	[flat|nested] 10+ messages in thread
* [pseudo][PATCH] Fix to fcntl guts to ignore flags that can be ORed into cmd
@ 2017-09-16  2:33 Will Page
  0 siblings, 0 replies; 10+ messages in thread
From: Will Page @ 2017-09-16  2:33 UTC (permalink / raw)
  To: yocto; +Cc: Seebs

[-- Attachment #1: Type: text/plain, Size: 93 bytes --]

I previously submitted this patch to the OE-core mailing list, and was
directed over here.

[-- Attachment #2: 0001-Fix-to-fcntl-guts-to-ignore-flags-that-can-be-ORed-i.patch --]
[-- Type: text/x-diff, Size: 2094 bytes --]

From c29b7aecfe671013897119b1dee2731900439285 Mon Sep 17 00:00:00 2001
From: Will Page <Will.Page@ni.com>
Date: Fri, 15 Sep 2017 13:07:44 -0700
Subject: [pseudo][PATCH] Fix to fcntl guts to ignore flags that can be ORed
 into cmd

The fcntl guts switch on "cmd" parameter to identify the fcntl
command being issued, but isn't aware of the file creation flags that
can be ORed in.

This change masks out the flags from the command only for the switch
statement so that it can correctly determine whether it needs to pass
"lock" or "arg".  When real_fcntl() is called, the original value is
still passed on. This corrects an issue observed using pseudo on modern
linux desktops resulting in "pseudo: unknown fcntl argument 1030,
assuming long argument." diagnostics in the output.  Decimal 1030 is
0x0406, which translates to O_NOCTTY | F_SETLK, and should call
"rc = real_fcntl(fd, cmd, lock);", but instead falls through to the
default case instead calling "rc = real_fcntl(fd, cmd, arg);".

Tested the change using perftest - without this patch, the issue is
trivially reproducible on my Ubuntu Xenial system, and after patching it
emitted no "unknown fcntl argument" diagnostics.

Signed-off-by: Will Page <Will.Page@ni.com>
---
 ports/linux/guts/fcntl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ports/linux/guts/fcntl.c b/ports/linux/guts/fcntl.c
index 639fd24..d278a8c 100644
--- a/ports/linux/guts/fcntl.c
+++ b/ports/linux/guts/fcntl.c
@@ -8,6 +8,10 @@
  */
  	long arg;
 	int save_errno;
+	/* some bits can be ORed into the cmd should be explicitly ignored
+	 * see fcntl documentation on F_SETFL */
+	int o_mode_mask = (O_RDONLY | O_WRONLY | O_RDWR) |
+		(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
 
 	/* we don't know whether we need lock or arg; grab both, which
 	 * should be safe enough on Linuxy systems. */
@@ -15,7 +19,7 @@
 	arg = va_arg(ap, long);
 	va_end(ap);
 
-	switch (cmd) {
+	switch (cmd & ~(o_mode_mask)) {
 	case F_DUPFD:
 #ifdef F_DUPFD_CLOEXEC
 	case F_DUPFD_CLOEXEC:
-- 
2.7.4


^ permalink raw reply related	[flat|nested] 10+ messages in thread
end of thread, other threads:[~2017-09-18 15:39 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-15 22:27 [pseudo][PATCH] Fix to fcntl guts to ignore flags that can be ORed into cmd Will Page
2017-09-15 22:30 ` ✗ patchtest: failure for " Patchwork
2017-09-15 22:48 ` [pseudo][PATCH] " Burton, Ross
2017-09-16  2:22   ` Will Page
2017-09-16 17:59     ` Seebs
2017-09-15 23:10 ` Seebs
2017-09-18 13:24   ` Richard Purdie
2017-09-18 15:15     ` Will Page
2017-09-18 15:39     ` Will Page
  -- strict thread matches above, loose matches on Subject: below --
2017-09-16  2:33 Will Page

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.