From patchwork Thu Apr 24 07:25:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 342134 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 7D1BA141836 for ; Thu, 24 Apr 2014 17:37:42 +1000 (EST) Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2F1DB140280 for ; Thu, 24 Apr 2014 17:26:00 +1000 (EST) Received: by mail-pd0-f182.google.com with SMTP id y10so1649811pdj.27 for ; Thu, 24 Apr 2014 00:25:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jms.id.au; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8t/ba1QxUYVUlGiADEjV0knOrsx0Azu422P8wr8xnO8=; b=H5frCVgVi3Ah7QfWgdv5t28kSG20qXEAk1GhofiiF1a8hlXJaIj3sHEMtmO5vZjkbG eJquOjzl79Nv/SS4RH034DRTEGIFYELQKUB1tCJWwSxK7sOUXUhj3fL687r+Ao9ACmcA RS1Yo4Lrhjzrbcmxp4DYOWQY/VCtQgMDSsUkM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=8t/ba1QxUYVUlGiADEjV0knOrsx0Azu422P8wr8xnO8=; b=VxQevVIVQPWeRvjjCmbTXAnYKtniXNZh9M2bAsCFHZndImcbqxRyCFCEo0tiJ1iSv3 Lo6uVJg9kIijnFD1qYKdqXuKsDRWSnR81e/+aWuhX8q5cFNzvWBStwv+LBWkmJczim7a BVf73E+Ev2In3OoJmiWvOtY5aXZikOo7km9jQ0tM8X2DsXGe/uOVucdzMq9yF4awMhBZ 81Ux2yUPYCC99lUXll8rkoWxdLGNHUhlTVGknfWlZ+h4B78+hpAU72foFKG8s2lrWFMi yEXvm7WeZBQvNhNViVK+5A5u/vj7uCGFhr8UHfzNlj264MNoxBaaCv95O8JYxXvWRl9p XCWg== X-Gm-Message-State: ALoCoQk09XkCq8J0M9s0qQS+ZEibM4f+oWtXmvT+MnfhNYRx2IWrNYpGys6WskzxN6xtBj3Iybmt X-Received: by 10.68.196.137 with SMTP id im9mr62161431pbc.105.1398324358460; Thu, 24 Apr 2014 00:25:58 -0700 (PDT) Received: from icarus.au.ibm.com (ppp118-210-54-94.lns20.adl2.internode.on.net. [118.210.54.94]) by mx.google.com with ESMTPSA id qx11sm16230192pab.35.2014.04.24.00.25.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Apr 2014 00:25:57 -0700 (PDT) From: Joel Stanley To: benh@kernel.crashing.org Subject: [PATCH 3/5] powerpc/powernv: Check sysfs size before copying Date: Thu, 24 Apr 2014 16:55:35 +0930 Message-Id: <1398324337-896-4-git-send-email-joel@jms.id.au> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398324337-896-1-git-send-email-joel@jms.id.au> References: <1398324337-896-1-git-send-email-joel@jms.id.au> Cc: neelegup@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, paulus@samba.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The sysparam code currently uses the userspace supplied number of bytes when memcpy()ing in to a local 64-byte buffer. Limit the maximum number of bytes by the size of the buffer. --- arch/powerpc/platforms/powernv/opal-sysparam.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/platforms/powernv/opal-sysparam.c b/arch/powerpc/platforms/powernv/opal-sysparam.c index a363c53..21fdc0a 100644 --- a/arch/powerpc/platforms/powernv/opal-sysparam.c +++ b/arch/powerpc/platforms/powernv/opal-sysparam.c @@ -135,6 +135,10 @@ static ssize_t sys_param_store(struct kobject *kobj, kobj_attr); ssize_t ret; + /* MAX_PARAM_DATA_LEN is sizeof(param_data_buf) */ + if (count > MAX_PARAM_DATA_LEN) + count = MAX_PARAM_DATA_LEN; + mutex_lock(&opal_sysparam_mutex); memcpy(param_data_buf, buf, count); ret = opal_set_sys_param(attr->param_id, attr->param_size,