From patchwork Tue Jan 19 18:19:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Lawrence X-Patchwork-Id: 1428783 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=hmkl1v01; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.a=rsa-sha256 header.s=20161025 header.b=KahbDg6Q; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKxlc5J6fz9sS8 for ; Wed, 20 Jan 2021 05:20:10 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=aAifgBOSpUFzSzQhrccIlnAHYDNyIgSbScKrbHJEXsk=; b=hmkl1v01odBY/3g75AI/+D1z3E ofyEFSaDykUDBIDHfcYVumruFpkk9lNe/xBREUJ/4qX0EonJYg3BCmW2JaMT2HL0ZV4c/zfJymOYl kUrG4L5TAFnSkeLj9NoBKCLNi2X40y+QLcGpe6ls9jqprIkcceOKhyZ3f0HoT728/2Ot6w4tDZMrZ nOGI/RQMxl6qQm+F/o9i8dC+oEJQdSDBPANxTzJVPhXObG0aQfP3GLryjJ++Azm6qjBTZdg2FJtmw im63AEIX/6MguUen78zEbC8FnJ+MxgM+zlDComlCPv7WQmvtFXMvEhDpyAEGZc74RAnSQZgLdCJJN SFvGfwpg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1vbg-00054f-HY; Tue, 19 Jan 2021 18:19:56 +0000 Received: from mail-yb1-xb4a.google.com ([2607:f8b0:4864:20::b4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1vbd-000541-FP for linux-um@lists.infradead.org; Tue, 19 Jan 2021 18:19:54 +0000 Received: by mail-yb1-xb4a.google.com with SMTP id l10so24592050ybt.6 for ; Tue, 19 Jan 2021 10:19:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=Ji13liyFDC2lDH5ciCyuoxMctj4vQjl6Y6p/lptZcMQ=; b=KahbDg6Qmg7cuIzxVxouSdEQoqwS8E49utrQBHjwJDxSY8Iu9EjXH0WOhgA+XsUrDb Q7622J51yBTUUqrn9mhnU+iA/59S00GXUNotCI4ejenbqihvLLuQSx5SwvbWykTLAe6O AD8c7jm41fKNEjJnJ1jPujUCA41yV+OZSQYj/uXdhzdlz73gs3bH8lh1kKAcD4YhHr/t ZLcTk3rNp3kNPgqrTo9qbyXgfLhXpd681hviEKtBzGt3HWUKwke0RjrVpyYI/pMZcMpr Y364NdVt87H8GtQ7qfZxowR0DZ3J3MvWQYBtV1m7ybGJzW86/XzzEalDe6THYlbQ6HUn sQnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=Ji13liyFDC2lDH5ciCyuoxMctj4vQjl6Y6p/lptZcMQ=; b=WYgMyGxq27KFvW7nDJ9RgCLaLYHd71o0YrE+gXp1K9kxEp6EYNDAKblsx3hUIr2ud1 MZAHfsR9No+ISJU11Qhdl8L4LOOm2XEFwZU5kDCx0OzvidGsfB3DCOtjtv6+LbTglB1h 6zwWJnAZQcz9tC27FiOxzXBbttQlAC/gFKO/ir/Wr29BOfXJ5z3LDMrn5/hboTwGmvro q6DPV8bYYojZxvdahwQd3nLYpYw3jls+fewliKxPKYH6KhpgJrvKs8vSnOqsD/xiYosI c4xkamdmgIAh9KTk6n3ehMpBx4IZ2dqDSnNVlDCywW3lguAP/mzUFtgt3qG1MPmNt0bF a0Yg== X-Gm-Message-State: AOAM530ZQUKEYUELqEc3ln9Qo0ta/mX4y5eQ7YLZXFfW8vMrdvjXtynt ObKNQv2B+bojKkE86an0nb+kM/43g8KfV7FHFy8= X-Google-Smtp-Source: ABdhPJy+hou+UDcK8kw2WBpbLq4zWJgQR+O5obdxbkZUyouV3vd8l2vNYOf7hyaHUOvqiQywwVa78r8h/D6Tx3gwyzA= X-Received: from paullawrence.c.googlers.com ([fda3:e722:ac3:10:24:72f4:c0a8:2534]) (user=paullawrence job=sendgmr) by 2002:a25:9706:: with SMTP id d6mr7695305ybo.211.1611080388823; Tue, 19 Jan 2021 10:19:48 -0800 (PST) Date: Tue, 19 Jan 2021 18:19:45 +0000 Message-Id: <20210119181945.2071053-1-paullawrence@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.284.gd98b1dd5eaa7-goog Subject: [PATCH] um: ubd: Fix crash from option parsing From: Paul Lawrence To: Jeff Dike , Richard Weinberger , Anton Ivanov , Gabriel Krisman Bertazi , Christopher Obbard , Paul Lawrence X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_131953_628411_2C35B24F X-CRM114-Status: GOOD ( 10.09 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:b4a listed in] [list.dnswl.org] -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-um@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Below patch will cause NULL ptr dereferences if the optional filenames are not present. Fixes: ef3ba87cb7c9 (um: ubd: Set device serial attribute from cmdline) Signed-off-by: Paul Lawrence Reviewed-by: Gabriel Krisman Bertazi --- arch/um/drivers/ubd_kern.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 13b1fe694b90..704989088f28 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c @@ -371,15 +371,15 @@ static int ubd_setup_common(char *str, int *index_out, char **error_out) break_loop: file = strsep(&str, ",:"); - if (*file == '\0') + if (file && *file == '\0') file = NULL; backing_file = strsep(&str, ",:"); - if (*backing_file == '\0') + if (backing_file && *backing_file == '\0') backing_file = NULL; serial = strsep(&str, ",:"); - if (*serial == '\0') + if (serial && *serial == '\0') serial = NULL; if (backing_file && ubd_dev->no_cow) {