Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp1046130pxj; Sat, 29 May 2021 01:18:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyUzmjT5NnAfGSqshKOhScOXqLa19IK6g5f8lDPlGAYqGrEb/+ZziD8iTTUg1sxL26VLPDS X-Received: by 2002:a02:95a8:: with SMTP id b37mr12201302jai.125.1622276319068; Sat, 29 May 2021 01:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622276319; cv=none; d=google.com; s=arc-20160816; b=SaiuwQhvPHQ4iiAF4efHkX2jv7xOgO2/LRpqEcsJiO57shaqeog6x5hl6oHHHl7OC2 hfIo/BEdGYS+Hzm5/6bQFUeSbKSVyWzx+bohe0/H5rCAY5uTh7T7EXp+UKcVjJ8sjE+p 7/Ic9gaKDTbPXN7tWNuNa5vQwsNYZKDjRqibYxYrD+pXgEvtd68NUHSMNMJTWXjE9Qco 1U0yw/nXatyNIiFDdoG0iht8ow8nCQRgaiWEiKpdTQFN89pZrpifqQ/4n7Y9Qi6Z1beO cTUJ6yKRJy4w1gpELiuRBF4FAeRiM2AdPaNg9VVLqKKP+a67CRbCREVsNBFDzYUN1JtO klTQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=frhJFqyUhQrhHiMkaziv2/wU51aw6Qnsl2d7k1/oEzI=; b=lZq6dJLOJAZKlEvucnxH97zADwVlpEgbQvxlKJ/43zPfzzi2lDYoDISnglfk5cfV55 3Lxpd0bmzbsfIgz2sSsl9i0ZvOByJ7aTiVVJgVvQ7NM2z+4qREpX2P1GCykVofh7gYzA R9sBQeTPt8rBx06CnoxMiO42yniCQtoQQVO0sMZBd6l2hC0ZETFOQHQPo0Wf0te0lH+z 1W+T6GlN6mTY3KXQZD/UMAoUfazSpzV7e2KFmyLH6pqP1CC/mwl6hGsyl0aQ5Xs/4izG WR70ltK5gUWImFI079dz9hzeaN+zKMTVHh9Q2OoOZSCKECX6cTyhHxxWg8h6Y5DH1kA6 KG1Q== 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=huawei.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id c22si7991044ioo.82.2021.05.29.01.18.26; Sat, 29 May 2021 01:18:39 -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; 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=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbhE2ISP (ORCPT + 99 others); Sat, 29 May 2021 04:18:15 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:5140 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229697AbhE2ISL (ORCPT ); Sat, 29 May 2021 04:18:11 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4FsZ811ZpXzYnYd; Sat, 29 May 2021 16:13:53 +0800 (CST) Received: from dggpeml500017.china.huawei.com (7.185.36.243) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sat, 29 May 2021 16:16:32 +0800 Received: from huawei.com (10.175.103.91) by dggpeml500017.china.huawei.com (7.185.36.243) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Sat, 29 May 2021 16:16:31 +0800 From: Yang Yingliang To: , , CC: , , , Subject: [PATCH -next 3/3] cifsd: check return value of ksmbd_vfs_getcasexattr() correctly Date: Sat, 29 May 2021 16:20:58 +0800 Message-ID: <20210529082058.3012233-3-yangyingliang@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210529082058.3012233-1-yangyingliang@huawei.com> References: <20210529082058.3012233-1-yangyingliang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.175.103.91] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpeml500017.china.huawei.com (7.185.36.243) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If ksmbd_vfs_getcasexattr() returns -ENOMEM, stream_buf is NULL, it will cause null-ptr-deref when using it to copy memory. So we need check the return value of ksmbd_vfs_getcasexattr() by comparing with 0. Fixes: f44158485826 ("cifsd: add file operations") Signed-off-by: Yang Yingliang --- fs/cifsd/vfs.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/cifsd/vfs.c b/fs/cifsd/vfs.c index 97d5584ec870..45ba30f1f2d2 100644 --- a/fs/cifsd/vfs.c +++ b/fs/cifsd/vfs.c @@ -274,7 +274,6 @@ static int ksmbd_vfs_stream_read(struct ksmbd_file *fp, char *buf, loff_t *pos, { ssize_t v_len; char *stream_buf = NULL; - int err; ksmbd_debug(VFS, "read stream data pos : %llu, count : %zd\n", *pos, count); @@ -283,10 +282,9 @@ static int ksmbd_vfs_stream_read(struct ksmbd_file *fp, char *buf, loff_t *pos, fp->stream.name, fp->stream.size, &stream_buf); - if (v_len == -ENOENT) { + if ((int)v_len < 0) { ksmbd_err("not found stream in xattr : %zd\n", v_len); - err = -ENOENT; - return err; + return (int)v_len; } memcpy(buf, &stream_buf[*pos], count); @@ -415,9 +413,9 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos, fp->stream.name, fp->stream.size, &stream_buf); - if (v_len == -ENOENT) { + if ((int)v_len < 0) { ksmbd_err("not found stream in xattr : %zd\n", v_len); - err = -ENOENT; + err = (int)v_len; goto out; } -- 2.25.1