From owner-freebsd-bugs@FreeBSD.ORG Sun Aug 10 20:10:05 2008 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0FD5C1065677 for ; Sun, 10 Aug 2008 20:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EB7548FC17 for ; Sun, 10 Aug 2008 20:10:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AKA4F8032110 for ; Sun, 10 Aug 2008 20:10:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m7AKA4h8032109; Sun, 10 Aug 2008 20:10:04 GMT (envelope-from gnats) Resent-Date: Sun, 10 Aug 2008 20:10:04 GMT Resent-Message-Id: <200808102010.m7AKA4h8032109@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Ighighi Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA3411065686 for ; Sun, 10 Aug 2008 20:02:34 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id B37B88FC08 for ; Sun, 10 Aug 2008 20:02:34 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m7AK2Y8J013066 for ; Sun, 10 Aug 2008 20:02:34 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.2/8.14.1/Submit) id m7AK2Ylv013065; Sun, 10 Aug 2008 20:02:34 GMT (envelope-from nobody) Message-Id: <200808102002.m7AK2Ylv013065@www.freebsd.org> Date: Sun, 10 Aug 2008 20:02:34 GMT From: Ighighi To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: kern/126433: [patch]: some missing checks in rm(1) X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 20:10:05 -0000 >Number: 126433 >Category: kern >Synopsis: [patch]: some missing checks in rm(1) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Aug 10 20:10:04 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Ighighi >Release: 6.3-STABLE (RELENG_6) >Organization: >Environment: FreeBSD orion 6.3-STABLE FreeBSD 6.3-STABLE #0: Tue Aug 5 17:02:02 VET 2008 root@orion:/usr/obj/usr/src/sys/CUSTOM i386 >Description: rm(1) allows root to delete uchg/uappend files. Before unlinking, it checks whether schg|sappend are set to skip the chflags() system call that clears uchg and uappend. It must also check whether uunlink|sunlink are set as they'd also make unlink() fail later. PS: Can anyone explain to me the usefulness of letting root skip uchg/uappend? FreeBSD and DragonFly are the only BSD's that do this. I'm playing with a -F option to unset uchg/uappend/uunlink for any user. The patch is available to anyone on request. >How-To-Repeat: >Fix: Attached patch successfully built and tested on RELENG_6 & -CURRENT sources. Patch attached with submission follows: --- rm.c.orig 2008-07-25 15:05:23.000000000 -0430 +++ rm.c 2008-08-10 15:00:05.465754091 -0430 @@ -230,7 +230,7 @@ rm_tree(char **argv) } else if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && - !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE)) && + !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE|SF_NOUNLINK|UF_NOUNLINK)) && chflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)) < 0) goto err; @@ -249,7 +249,7 @@ rm_tree(char **argv) rval = 0; if (!uid && (p->fts_statp->st_flags & (UF_APPEND|UF_IMMUTABLE)) && - !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE))) + !(p->fts_statp->st_flags & (SF_APPEND|SF_IMMUTABLE|SF_NOUNLINK|UF_NOUNLINK))) rval = chflags(p->fts_accpath, p->fts_statp->st_flags &= ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { @@ -349,7 +349,7 @@ rm_file(char **argv) rval = 0; if (!uid && !S_ISWHT(sb.st_mode) && (sb.st_flags & (UF_APPEND|UF_IMMUTABLE)) && - !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE))) + !(sb.st_flags & (SF_APPEND|SF_IMMUTABLE|SF_NOUNLINK|UF_NOUNLINK))) rval = chflags(f, sb.st_flags & ~(UF_APPEND|UF_IMMUTABLE)); if (rval == 0) { if (S_ISWHT(sb.st_mode)) >Release-Note: >Audit-Trail: >Unformatted: