Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp2774161ybk; Tue, 12 May 2020 07:52:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwldxT2+kHDEnU5h2CIi/TfWGAscXhkgBPyX8PEOvrV278Er6gxgC5xIjoBkKEt/SgCQRiP X-Received: by 2002:a17:906:51b:: with SMTP id j27mr8929174eja.246.1589295120755; Tue, 12 May 2020 07:52:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589295120; cv=none; d=google.com; s=arc-20160816; b=0It9lFIMUoFzyI0PZJeOF+gUL+G5ROX1h0c90NV1TXDcpD+x1X5jQkP8TIqv3MtfaQ zgJjP5LQWeaIwySy+7mZyqNcfqd/YpCFjAdI5R28wgz+JKafoduSc1B2sq6vISlYW71b TlggzteSlZBXbDYkwL4xSzpvQ213vV2C+dqvLzENiYBPeBu1WBGgVnOXxLuRR9mR9Qg0 NrSwBQLspRWn++VvC/43tTehioQaYe68mod/3Gmh+49DfnbGA3prRiXHs5nygZ+I4Ntl OCNnLfD7q6hciwzAoiMFCATP6LZ5xU0ilCD8LnKURay7rMlkbqQ9j6FOTIJJDp+nKtZG FVKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=jx+puuCmllp6pyXQNaubWo+qtrpR0nODcwxMTtKrcSI=; b=VzsGzQYTEUdAGCmerc2PxLuunVgcVQxNh+uTQwd9a0YHFL9jymIO2S17ySYgGqPy9u B6B8B20/65V7lUqey4SfYd1V2nFYC4jyE1T6UPw6L8eFdNKCpvlQoHo4D41z4JAY54h8 lL/1brNqNeUQyIuIHp540ot0i7niyvr+4oBg8bN/1D+Wg6ASXerp3GsMyzmb5GhMGnNH 8DPvXdDCXFxLDQSY1V9Yuvr20iQeUFgEjHaRhMNCM2pKRUu605hvkEqlWk1Dd5L/ADRp z/3Baya8cs+Fchbx9gv8NMmo/iiNKqdMNF/LK/CfGPidyj4dJaB6QedviKc6S3h1XO9P dWig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="TEP/hivc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z18si8248066ejf.186.2020.05.12.07.51.37; Tue, 12 May 2020 07:52:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="TEP/hivc"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727924AbgELOtS (ORCPT + 99 others); Tue, 12 May 2020 10:49:18 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30192 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727100AbgELOtR (ORCPT ); Tue, 12 May 2020 10:49:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589294956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jx+puuCmllp6pyXQNaubWo+qtrpR0nODcwxMTtKrcSI=; b=TEP/hivcoxT+LrYt8ru6wCChWSNSqJu8gNtaf3R1foIQH/lDp156xulyk3FYI/Qj3Gz8mK gkDyAKQr7G6WCBrpmFC1yzK6tIfEdZLHFX+aF1wPLW9jiVAR2KZqsMM+Lo7Y0byx4Ds8O7 OZjsTEHe2OQtzqe2/T+IXoa5FWoWN8s= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-4-Mfu0zy3TOOmWSoFOm3Tffw-1; Tue, 12 May 2020 10:49:12 -0400 X-MC-Unique: Mfu0zy3TOOmWSoFOm3Tffw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4FEAC100A614; Tue, 12 May 2020 14:49:11 +0000 (UTC) Received: from optiplex-lnx (unknown [10.3.128.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99BB462A28; Tue, 12 May 2020 14:49:09 +0000 (UTC) Date: Tue, 12 May 2020 10:49:06 -0400 From: Rafael Aquini To: Luis Chamberlain Cc: Tso Ted , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, keescook@chromium.org, yzaikin@google.com Subject: Re: [PATCH] kernel: sysctl: ignore invalid taint bits introduced via kernel.tainted and taint the kernel with TAINT_USER on writes Message-ID: <20200512144906.GG367616@optiplex-lnx> References: <20200511215904.719257-1-aquini@redhat.com> <20200511231045.GV11244@42.do-not-panic.com> <20200511235914.GF367616@optiplex-lnx> <20200512001702.GW11244@42.do-not-panic.com> <20200512010313.GA725253@optiplex-lnx> <20200512050405.GY11244@42.do-not-panic.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20200512050405.GY11244@42.do-not-panic.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 12, 2020 at 05:04:05AM +0000, Luis Chamberlain wrote: > On Mon, May 11, 2020 at 09:03:13PM -0400, Rafael Aquini wrote: > > On Tue, May 12, 2020 at 12:17:03AM +0000, Luis Chamberlain wrote: > > > On Mon, May 11, 2020 at 07:59:14PM -0400, Rafael Aquini wrote: > > > > On Mon, May 11, 2020 at 11:10:45PM +0000, Luis Chamberlain wrote: > > > > > On Mon, May 11, 2020 at 05:59:04PM -0400, Rafael Aquini wrote: > > > > > > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > > > > > > index 8a176d8727a3..f0a4fb38ac62 100644 > > > > > > --- a/kernel/sysctl.c > > > > > > +++ b/kernel/sysctl.c > > > > > > @@ -2623,17 +2623,32 @@ static int proc_taint(struct ctl_table *table, int write, > > > > > > return err; > > > > > > > > > > > > if (write) { > > > > > > + int i; > > > > > > + > > > > > > + /* > > > > > > + * Ignore user input that would make us committing > > > > > > + * arbitrary invalid TAINT flags in the loop below. > > > > > > + */ > > > > > > + tmptaint &= (1UL << TAINT_FLAGS_COUNT) - 1; > > > > > > > > > > This looks good but we don't pr_warn() of information lost on intention. > > > > > > > > > > > > > Are you thinking in sth like: > > > > > > > > + if (tmptaint > TAINT_FLAGS_MAX) { > > > > + tmptaint &= TAINT_FLAGS_MAX; > > > > + pr_warn("proc_taint: out-of-range invalid input ignored" > > > > + " tainted_mask adjusted to 0x%x\n", tmptaint); > > > > + } > > > > ? > > > > > > Sure that would clarify this. > > > > > > > > > + > > > > > > /* > > > > > > * Poor man's atomic or. Not worth adding a primitive > > > > > > * to everyone's atomic.h for this > > > > > > */ > > > > > > - int i; > > > > > > for (i = 0; i < BITS_PER_LONG && tmptaint >> i; i++) { > > > > > > if ((tmptaint >> i) & 1) > > > > > > add_taint(i, LOCKDEP_STILL_OK); > > > > > > } > > > > > > + > > > > > > + /* > > > > > > + * Users with SYS_ADMIN capability can include any arbitrary > > > > > > + * taint flag by writing to this interface. If that's the case, > > > > > > + * we also need to mark the kernel "tainted by user". > > > > > > + */ > > > > > > + add_taint(TAINT_USER, LOCKDEP_STILL_OK); > > > > > > > > > > I'm in favor of this however I'd like to hear from Ted on if it meets > > > > > the original intention. I would think he had a good reason not to add > > > > > it here. > > > > > > > > > > > > > Fair enough. The impression I got by reading Ted's original commit > > > > message is that the intent was to have TAINT_USER as the flag set > > > > via this interface, even though the code was allowing for any > > > > arbitrary value. > > > > > > That wasn't my reading, it was that the user did something very odd > > > with user input which we don't like as kernel developers, and it gives > > > us a way to prove: hey you did something stupid, sorry but I cannot > > > support your kernel panic. > > > > > > > I think it's OK to let the user fiddle with > > > > the flags, as it's been allowed since the introduction of > > > > this interface, but we need to reflect that fact in the > > > > tainting itself. Since TAINT_USER is not used anywhere, > > > > > > I see users of TAINT_USER sprinkled around > > > > > > > I meant in the original commit that introduced it > > (commit 34f5a39899f3f3e815da64f48ddb72942d86c366). Sorry I > > miscomunicated that. > > > > In its current usage, it seems that the other places adding TAINT_USER > > match with what is being proposed here: To signal when we have user > > fiddling with kernel / module parameters. > > drivers/base/regmap/regmap-debugfs.c requires *manual* code changes > to compile / enable some knob. i915 complains about unsafe module > params such as module_param_cb_unsafe() core_param_unsafe(). Then > drivers/soundwire/cadence_master.c is for when a debugfs dangerous > param was used. > > This still doesn't rule out the use of proc_taint() for testing taint, > and that adding it may break some tests. So even though this would > only affect some tests scripts, I can't say that adding this taint won't > cause some headaches to someone. I wouldn't encourage its use on > proc_taint() from what I can see so far. > OK, I?ll repost without the hunk forcing the taint. If we eventually come to the conclusion that tainting in proc_taint() is the right thing to do, we can do that part of the change later. Do you think we should use printk_ratelimited() in the ignore message, instead? Cheers, -- Rafael