From patchwork Sun Jul 11 02:16:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: shenghui X-Patchwork-Id: 58502 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 33F70B6EF1 for ; Sun, 11 Jul 2010 12:16:31 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754018Ab0GKCP5 (ORCPT ); Sat, 10 Jul 2010 22:15:57 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:36794 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753876Ab0GKCP4 (ORCPT ); Sat, 10 Jul 2010 22:15:56 -0400 Received: by pvc7 with SMTP id 7so1361380pvc.19 for ; Sat, 10 Jul 2010 19:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:subject :message-id:x-mailer:mime-version:content-type :content-transfer-encoding; bh=Y/gIPr5cN2Ee3BN2quQzb1awbeaUjs0TnzkRbgsm0qg=; b=HsTAUSFS25E+1PnsATcFdiyoKgi40N97FPJ4yv2BSYHL+uQQUQ/6K0AoqC3uGJI7KE hgnidv+hM8l7LLqt5z+8hvX9WIQekeoQtINgLRAsRAKA7RdX04CJKZl1zgzGmeFXs70Y eyTm8Lc5+nyDKoyUjOKNYj2ZBsz9FkV1TXaQk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:subject:message-id:x-mailer:mime-version:content-type :content-transfer-encoding; b=ngx7vS2g++oP7Bhh+pfyCXO+xOoOiSf8pN2zsuCMXok6uG5YxfGSTz8Ub6x5FzN+K5 Y1/7pgT10RvJpqibrkQi4sBcbDlH4dNqXS/UziaNjHfPv+shFhv4PkgYJaDv1ItSBk5S 6Of2ZZ5gJH2Xv1bnZVXtwtaOdAi4CCNyAQLXQ= Received: by 10.114.93.10 with SMTP id q10mr13846886wab.130.1278814555208; Sat, 10 Jul 2010 19:15:55 -0700 (PDT) Received: from a57e827a1d3243b (xz-18-167-a8.bta.net.cn [202.108.18.167]) by mx.google.com with ESMTPS id q6sm41882102waj.10.2010.07.10.19.15.52 (version=SSLv3 cipher=RC4-MD5); Sat, 10 Jul 2010 19:15:54 -0700 (PDT) Date: Sun, 11 Jul 2010 10:16:04 +0800 From: "crosslonelyover" To: "kernel-janitors" , "linux-kernel" , "linux-ext4" , "linux-kernel" , "kernel-janitors" , "error27" Subject: [PATCH & RESEND] avoid NULL deference in ext2_xattr_get Message-ID: <201007111016021569718@gmail.com> X-mailer: Foxmail 6, 15, 201, 22 [cn] Mime-Version: 1.0 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Hi Dan Carpenter, Thanks for your instructions. I regenerated the patch. Please check it. From 3149865e0d118b939c27659a4e4c884eaa6b3a4c Mon Sep 17 00:00:00 2001 From: Wang Sheng-Hui Date: Sat, 10 Jul 2010 22:07:37 -0400 Subject: [PATCH] avoid NULL deference in ext2_xattr_get Signed-off-by: Wang Sheng-Hui --- fs/ext2/xattr.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c index 7c39157..81ec1c6 100644 --- a/fs/ext2/xattr.c +++ b/fs/ext2/xattr.c @@ -156,11 +156,12 @@ ext2_xattr_get(struct inode *inode, int name_index, const char *name, char *end; int error; + if (name == NULL) + return -EINVAL; + ea_idebug(inode, "name=%d.%s, buffer=%p, buffer_size=%ld", name_index, name, buffer, (long)buffer_size); - if (name == NULL) - return -EINVAL; down_read(&EXT2_I(inode)->xattr_sem); error = -ENODATA; if (!EXT2_I(inode)->i_file_acl)