From patchwork Mon Jun 20 08:33:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Shilovsky X-Patchwork-Id: 896342 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5K8WGm5007996 for ; Mon, 20 Jun 2011 08:34:04 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750887Ab1FTIeE (ORCPT ); Mon, 20 Jun 2011 04:34:04 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:60116 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844Ab1FTIeD (ORCPT ); Mon, 20 Jun 2011 04:34:03 -0400 Received: by bwz15 with SMTP id 15so2048950bwz.19 for ; Mon, 20 Jun 2011 01:34:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=7GuFV1knRJ5rya/HC4gh7jYCp2KMwXSkJcWr8hLvfCA=; b=KQDOn0GUALwiZGjFPEyHkhFUsOgEmgV8KdgXctPyrb88Hveggcc7tOwX3P5vp9l531 VP7Wlh00XQqwWTwSh4vIHmSN6NJLWdZvHaI2OeLAq1mJpmUPJs9l1JTneHFdTSF2vx/l ktSUQaQo8/sGeTu7aojPFYiGrINvrWZhMZn2U= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=C6qAR6MTwa7m8U9myVF48WHP0a1ELntHS7MRVTBhOlY4WnjodvUq7Ic6cUw6936gQb lLYvXWel5vaCheaDmM5jyhblk51hpJ9d2JUDrBpsGNaOrMbUrrNqIEv0XN/IV83qkPmC 7c1o+wOOGQvfFggCwBuPqCwqReMufDROpK6Cs= Received: by 10.204.20.143 with SMTP id f15mr1948734bkb.173.1308558841287; Mon, 20 Jun 2011 01:34:01 -0700 (PDT) Received: from localhost.localdomain ([79.126.79.181]) by mx.google.com with ESMTPS id ag6sm4234509bkc.18.2011.06.20.01.33.59 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Jun 2011 01:34:00 -0700 (PDT) From: Pavel Shilovsky To: linux-cifs@vger.kernel.org Subject: [OOPS] 3.0-rc1 cifs Date: Mon, 20 Jun 2011 12:33:16 +0400 Message-Id: <1308558796-2693-1-git-send-email-piastryyy@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <201106152155.48167.maciej.rutecki@gmail.com> References: <201106152155.48167.maciej.rutecki@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 20 Jun 2011 08:34:04 +0000 (UTC) Figured it out: it was broken by b946845a9dc523c759cae2b6a0f6827486c3221a commit - "cifs: cifs_parse_mount_options: do not tokenize mount options in-place". So, as a quick fix I suggest to apply this patch. [PATCH] CIFS: Fix kfree() with constant string in a null user case Signed-off-by: Pavel Shilovsky --- fs/cifs/connect.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 20c60dd..ad3de1c 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2887,7 +2887,11 @@ try_mount_again: if (volume_info->nullauth) { cFYI(1, "null user"); - volume_info->username = ""; + volume_info->username = kzalloc(1, GFP_KERNEL); + if (volume_info->username == NULL) { + rc = -ENOMEM; + goto out; + } } else if (volume_info->username) { /* BB fixme parse for domain name here */ cFYI(1, "Username: %s", volume_info->username);