Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp2447522pxu; Mon, 7 Dec 2020 06:57:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2HubtAls4tUTCEX5sf7dkC0eFjsRF3z4cMmmOvrkCnmnVweSAMlmD4QwYrS+xXcsoumj4 X-Received: by 2002:a50:fb97:: with SMTP id e23mr20691645edq.208.1607353031278; Mon, 07 Dec 2020 06:57:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607353031; cv=none; d=google.com; s=arc-20160816; b=vSCjGtyTFhuJyL3JiWQ1NmQ55/BeSlSvXTk7+XRZwDk6cr63y38m3P18Z9kFcTHBLq Q8tVSCVRqbpIjO9jqkMlLt/yIN7TtA2wPHKxz58fR3uy4NHLjU7MTzACNAW+bJylbyDu jbORQMfa1FLTtEjFMaz00RHXOOEp6AJc4CI0skMmKlAOj8OyPuuxGmU31xOn64rAEo0/ nze0429ir4VozYxBUGMbKZAYOi9tOJn7XPsq8rIF/wRbwZnFoGlTXSWKlGHSHJKEJl+V oH0S3AXRipUTUJm7h1tJOO5Vyk/UlYzFi+M7XLdXqv6ggbknm6vdcgnsoB0aRpvNjQHH K02Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=7Hwl4bNQN8B6t0OhOMZSVF4uXPpvM+/23MyQ+X/3XlI=; b=lCVL2vv5zVfrCj480KQWgedmuBKKP3JYok1Jd5cuza5xRdUEn9nO0PFfHO0IkPttP4 /bXdOgP+2gyG9f170nKEyZpWgJ/CZwi59+8EiAnpS7BN3va1LsNdz38+Zr2OIjoQf+m8 8PNAzLrSTti0QGph5aQS1r//H5CgM1xHukQBRNUCSUGYR+TONft4Nxa+/DE0232tWblV J655nsyoZ36hbS2mKaCV08tDGnYcPIXqGGa/FmOs8FspiJwGWFcZ9QlEdwmLqPP9Cn0H V2MWg35kG9ILlXcOnVOM73+5rapIDToCi+32FFOh1WjjnUAytHd08O5n+Z6S1QEvtQzp cZPA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c15si8170153edy.244.2020.12.07.06.56.48; Mon, 07 Dec 2020 06:57:11 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbgLGOza (ORCPT + 99 others); Mon, 7 Dec 2020 09:55:30 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:37469 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725772AbgLGOza (ORCPT ); Mon, 7 Dec 2020 09:55:30 -0500 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kmHuZ-0005Ri-6i; Mon, 07 Dec 2020 14:54:47 +0000 From: Colin King To: Danil Kipnis , Jack Wang , Jens Axboe , Jason Gunthorpe , Bart Van Assche , linux-block@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH][next] block/rnbd: fix a null pointer dereference on dev->blk_symlink_name Date: Mon, 7 Dec 2020 14:54:46 +0000 Message-Id: <20201207145446.169978-1-colin.king@canonical.com> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Colin Ian King Currently in the case where dev->blk_symlink_name fails to be allocates the error return path attempts to set an end-of-string character to the unallocated dev->blk_symlink_name causing a null pointer dereference error. Fix this by returning with an explicity ENOMEM error (which also is missing in the original code as was not initialized). Addresses-Coverity: ("Dereference after null check") Fixes: 1eb54f8f5dd8 ("block/rnbd: client: sysfs interface functions") Signed-off-by: Colin Ian King --- drivers/block/rnbd/rnbd-clt-sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/rnbd/rnbd-clt-sysfs.c b/drivers/block/rnbd/rnbd-clt-sysfs.c index c3c96a567568..a7caeedeb198 100644 --- a/drivers/block/rnbd/rnbd-clt-sysfs.c +++ b/drivers/block/rnbd/rnbd-clt-sysfs.c @@ -499,7 +499,7 @@ static int rnbd_clt_add_dev_symlink(struct rnbd_clt_dev *dev) dev->blk_symlink_name = kzalloc(len, GFP_KERNEL); if (!dev->blk_symlink_name) { rnbd_clt_err(dev, "Failed to allocate memory for blk_symlink_name\n"); - goto out_err; + return -ENOMEM; } ret = rnbd_clt_get_path_name(dev, dev->blk_symlink_name, -- 2.29.2