Module Name: src
Committed By: bouyer
Date: Fri May 20 21:50:10 UTC 2011
Modified Files:
src/doc [netbsd-5]: CHANGES-5.2
src/sys/fs/puffs [netbsd-5]: puffs_msgif.c
Log Message:
Revert ticket 1604, it does't build.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.80 -r1.1.2.81 src/doc/CHANGES-5.2
cvs rdiff -u -r1.72.4.2 -r1.72.4.3 src/sys/fs/puffs/puffs_msgif.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.2
diff -u src/doc/CHANGES-5.2:1.1.2.80 src/doc/CHANGES-5.2:1.1.2.81
--- src/doc/CHANGES-5.2:1.1.2.80 Fri May 20 19:40:43 2011
+++ src/doc/CHANGES-5.2 Fri May 20 21:50:08 2011
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.2,v 1.1.2.80 2011/05/20 19:40:43 bouyer Exp $
+# $NetBSD: CHANGES-5.2,v 1.1.2.81 2011/05/20 21:50:08 bouyer Exp $
A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2
release:
@@ -5096,15 +5096,6 @@
Fixes CVE-2011-996
[spz, ticket #1603]
-sys/fs/puffs/puffs_msgif.c 1.84 via patch
-
- Apply patch from PR kern/44093 by yamt:
-
- Interrupt server wait only on certain signals (same set at nfs -i)
- instead of all signals. According to the PR this helps with
- "git clone" run on a puffs file system.
- [manu, ticket #1604]
-
etc/mtree/NetBSD.dist.base 1.87 via patch
share/i18n/csmapper/CBM/CBMINT%UCS.src 1.1
share/i18n/csmapper/CBM/Makefile.inc 1.1
Index: src/sys/fs/puffs/puffs_msgif.c
diff -u src/sys/fs/puffs/puffs_msgif.c:1.72.4.2 src/sys/fs/puffs/puffs_msgif.c:1.72.4.3
--- src/sys/fs/puffs/puffs_msgif.c:1.72.4.2 Thu May 19 21:00:16 2011
+++ src/sys/fs/puffs/puffs_msgif.c Fri May 20 21:50:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.c,v 1.72.4.2 2011/05/19 21:00:16 bouyer Exp $ */
+/* $NetBSD: puffs_msgif.c,v 1.72.4.3 2011/05/20 21:50:09 bouyer Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.72.4.2 2011/05/19 21:00:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_msgif.c,v 1.72.4.3 2011/05/20 21:50:09 bouyer Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -352,30 +352,17 @@
if (__predict_false((park->park_flags & PARKFLAG_WANTREPLY)
&& (park->park_flags & PARKFLAG_CALL) == 0
&& (l->l_flag & LW_PENDSIG) != 0 && sigispending(l, 0))) {
- sigset_t ss;
-
- /*
- * see the comment about signals in puffs_msg_wait.
- */
- sigpending1(l, &ss);
- if (sigismember(&ss, SIGINT) ||
- sigismember(&ss, SIGTERM) ||
- sigismember(&ss, SIGKILL) ||
- sigismember(&ss, SIGHUP) ||
- sigismember(&ss, SIGQUIT)) {
- park->park_flags |= PARKFLAG_HASERROR;
- preq->preq_rv = EINTR;
- if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VN
- && (preq->preq_optype == PUFFS_VN_INACTIVE
- || preq->preq_optype == PUFFS_VN_RECLAIM)) {
- park->park_preq->preq_opclass |=
- PUFFSOPFLAG_FAF;
- park->park_flags &= ~PARKFLAG_WANTREPLY;
- DPRINTF(("puffs_msg_enqueue: "
- "converted to FAF %p\n", park));
- } else {
- return;
- }
+ park->park_flags |= PARKFLAG_HASERROR;
+ preq->preq_rv = EINTR;
+ if (PUFFSOP_OPCLASS(preq->preq_opclass) == PUFFSOP_VN
+ && (preq->preq_optype == PUFFS_VN_INACTIVE
+ || preq->preq_optype == PUFFS_VN_RECLAIM)) {
+ park->park_preq->preq_opclass |= PUFFSOPFLAG_FAF;
+ park->park_flags &= ~PARKFLAG_WANTREPLY;
+ DPRINTF(("puffs_msg_enqueue: converted to FAF %p\n",
+ park));
+ } else {
+ return;
}
}
@@ -444,31 +431,11 @@
int
puffs_msg_wait(struct puffs_mount *pmp, struct puffs_msgpark *park)
{
- lwp_t *l = curlwp;
- proc_t *p = l->l_proc;
- struct puffs_req *preq = park->park_preq; /* XXX: hmmm */
- sigset_t ss;
- sigset_t oss;
+ struct puffs_req *preq = park->park_preq; /* XXX: hmmm */
struct mount *mp = PMPTOMP(pmp);
int error = 0;
int rv;
- /*
- * block unimportant signals.
- *
- * The set of "important" signals here was chosen to be same as
- * nfs interruptible mount.
- */
- sigfillset(&ss);
- sigdelset(&ss, SIGINT);
- sigdelset(&ss, SIGTERM);
- sigdelset(&ss, SIGKILL);
- sigdelset(&ss, SIGHUP);
- sigdelset(&ss, SIGQUIT);
- mutex_enter(p->p_lock);
- sigprocmask1(l, SIG_BLOCK, &ss, &oss);
- mutex_exit(p->p_lock);
-
mutex_enter(&pmp->pmp_lock);
puffs_mp_reference(pmp);
mutex_exit(&pmp->pmp_lock);
@@ -556,10 +523,6 @@
puffs_mp_release(pmp);
mutex_exit(&pmp->pmp_lock);
- mutex_enter(p->p_lock);
- sigprocmask1(l, SIG_SETMASK, &oss, NULL);
- mutex_exit(p->p_lock);
-
return rv;
}
