svn commit: r189370 - in stable/7/sys: . compat/linux contrib/pf dev/ath/ath_hal dev/cxgb

[Alexander Leidinger]

Author: netchild
Date: Wed Mar  4 20:26:39 2009
New Revision: 189370
URL: http://svn.freebsd.org/changeset/base/189370

Log:
  MFC r188572:
    Fix an edge-case of the linux readdir: We need the size of a linux dirent
    structure, not the size of a pointer to it.
  
    PR:		131099
    Submitted by:	Andreas Kies <andikies at gmail.com>

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/compat/linux/linux_file.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/compat/linux/linux_file.c
==============================================================================
--- stable/7/sys/compat/linux/linux_file.c	Wed Mar  4 18:36:48 2009	(r189369)
+++ stable/7/sys/compat/linux/linux_file.c	Wed Mar  4 20:26:39 2009	(r189370)
@@ -438,7 +438,7 @@ getdents_common(struct thread *td, struc
 		/* readdir(2) case. Always struct dirent. */
 		if (is64bit)
 			return (EINVAL);
-		nbytes = sizeof(linux_dirent);
+		nbytes = sizeof(*linux_dirent);
 		justone = 1;
 	} else
 		justone = 0;