From 374976dd138bd4d74608d5658c84c0e257716d0b Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Fri, 16 Mar 2012 19:28:51 -0700
Subject: Fix SHMLBA on sparc.

	[BZ #6471]
	* sysdeps/unix/sysv/linux/shmat.c (shmat): Test for syscall errors
	properly.
	* sysdeps/unix/sysv/linux/sparc/getshmlba.c: New file.
	* sysdeps/unix/sysv/linux/sparc/Makefile: Add getshmlba to
	sysdep_routines when subdir is sysvipc.
	* sysdeps/unix/sysv/linux/sparc/bits/shm.h (SHMLBA): Use new
	__getshmlba helper.
---
 sysdeps/unix/sysv/linux/shmat.c           | 22 ++++++++++-------
 sysdeps/unix/sysv/linux/sparc/Makefile    |  4 ++++
 sysdeps/unix/sysv/linux/sparc/bits/shm.h  |  4 ++--
 sysdeps/unix/sysv/linux/sparc/getshmlba.c | 40 +++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 11 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/sparc/getshmlba.c

(limited to 'sysdeps/unix/sysv')

diff --git a/sysdeps/unix/sysv/linux/shmat.c b/sysdeps/unix/sysv/linux/shmat.c
index 2eec6a6e62..dd75491ce4 100644
--- a/sysdeps/unix/sysv/linux/shmat.c
+++ b/sysdeps/unix/sysv/linux/shmat.c
@@ -35,7 +35,8 @@ shmat (shmid, shmaddr, shmflg)
      const void *shmaddr;
      int shmflg;
 {
-  void *__unbounded result;
+  INTERNAL_SYSCALL_DECL(err);
+  unsigned long resultvar;
   void *__unbounded raddr;
 
 #if __BOUNDED_POINTERS__
@@ -47,12 +48,15 @@ shmat (shmid, shmaddr, shmflg)
     length = shmds.shm_segsz;
 #endif
 
-  result = (void *__unbounded) INLINE_SYSCALL (ipc, 5, IPCOP_shmat,
-					       shmid, shmflg,
-					       (long int) __ptrvalue (&raddr),
-					       __ptrvalue ((void *) shmaddr));
-  if ((unsigned long) result <= -(unsigned long) SHMLBA)
-    result = raddr;
-
-  return BOUNDED_N (result, length);
+  resultvar = INTERNAL_SYSCALL (ipc, err, 5, IPCOP_shmat,
+				shmid, shmflg,
+				(long int) __ptrvalue (&raddr),
+				__ptrvalue ((void *) shmaddr));
+  if (INTERNAL_SYSCALL_ERROR_P (resultvar, err))
+    {
+      __set_errno (INTERNAL_SYSCALL_ERRNO (resultvar, err));
+      return (void *) -1;
+    }
+
+  return BOUNDED_N (raddr, length);
 }
diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile
index 96bf0bbd16..d769c48526 100644
--- a/sysdeps/unix/sysv/linux/sparc/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/Makefile
@@ -7,3 +7,7 @@ syscall-list-64bit-condition := __WORDSIZE == 64
 ifeq ($(subdir),rt)
 librt-routines += rt-sysdep
 endif
+
+ifeq ($(subdir),sysvipc)
+sysdep_routines += getshmlba
+endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
index b0966d61c2..eb530de98f 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
@@ -40,8 +40,8 @@
 __BEGIN_DECLS
 
 /* Segment low boundary address multiple.  */
-#define SHMLBA		(__getpagesize ())
-extern int __getpagesize (void) __THROW __attribute__ ((__const__));
+#define SHMLBA		(__getshmlba ())
+extern int __getshmlba (void) __attribute__ ((__const__));
 
 
 /* Type to count number of attaches.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/getshmlba.c b/sysdeps/unix/sysv/linux/sparc/getshmlba.c
new file mode 100644
index 0000000000..205bed2720
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/getshmlba.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 2012
+   Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <unistd.h>
+#include <sys/shm.h>
+#include <ldsodefs.h>
+
+int
+__getshmlba (void)
+{
+  uint64_t hwcap = GLRO(dl_hwcap);
+  int pgsz = GLRO(dl_pagesize);
+
+  if (hwcap & HWCAP_SPARC_V9)
+    {
+      if (pgsz < (16 * 1024))
+	return 16 * 1024;
+      else
+	return pgsz;
+    }
+  else if (!(hwcap & HWCAP_SPARC_FLUSH))
+    return 64 * 1024;
+  else
+    return 256 * 1024;
+}
-- 
cgit 1.4.1