linux-kernel - linux-next: manual merge of the compat tree with the file-private-locks tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20140314170637.6370787172f6b7a78a5c2812@kernel.org>
Date:	Fri, 14 Mar 2014 17:06:37 +0000
From:	Mark Brown <broonie@...nel.org>
To:	Heiko Carstens <heiko.carstens@...ibm.com>,
	Jeff Layton <jlayton@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the compat tree with the
 file-private-locks tree

Hi Heiko,

Today's linux-next merge of the compat tree got a conflict in fs/compat.c between commit 1ed1950c412f1b ("locks: add new fcntl cmd values for handling file private locks") from the file-private-locks tree and commit 932602e238329 ("fs/compat: convert to COMPAT_SYSCALL_DEFINE with changing parameter types") from the compat tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc fs/compat.c
index 800914a1092a,19252b97f0cc..000000000000
--- a/fs/compat.c
+++ b/fs/compat.c
@@@ -399,23 -399,8 +399,23 @@@ static int put_compat_flock64(struct fl
  }
  #endif
  
 +static unsigned int
 +convert_fcntl_cmd(unsigned int cmd)
 +{
 +      switch (cmd) {
 +      case F_GETLK64:
 +              return F_GETLK;
 +      case F_SETLK64:
 +              return F_SETLK;
 +      case F_SETLKW64:
 +              return F_SETLKW;
 +      }
 +
 +      return cmd;
 +}
 +
- asmlinkage long compat_sys_fcntl64(unsigned int fd, unsigned int cmd,
-               unsigned long arg)
+ COMPAT_SYSCALL_DEFINE3(fcntl64, unsigned int, fd, unsigned int, cmd,
+                      compat_ulong_t, arg)
  {
        mm_segment_t old_fs;
        struct flock f;


Content of type "application/pgp-signature" skipped