From patchwork Wed Sep 30 09:09:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Reynal X-Patchwork-Id: 7293791 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8D4149F1D5 for ; Wed, 30 Sep 2015 09:10:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B62292068E for ; Wed, 30 Sep 2015 09:10:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 326ED20687 for ; Wed, 30 Sep 2015 09:10:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755127AbbI3JJ1 (ORCPT ); Wed, 30 Sep 2015 05:09:27 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:37753 "EHLO mail-wi0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754770AbbI3JJT (ORCPT ); Wed, 30 Sep 2015 05:09:19 -0400 Received: by wicfx3 with SMTP id fx3so51594127wic.0 for ; Wed, 30 Sep 2015 02:09:18 -0700 (PDT) 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=otW0asYBaE9eMn2c6Yw22jJTBniXCCiaqYY0u1y8cWA=; b=dG+iUcKZ0WB4pKSYpGcjaWnkwnbjswaCbopUUnKlcDk6KtagoHnVZ4RA76vYIK+YIh U4TBhtqphYF+wgKP5be5+P8nRN9ay/Af/VOYMs2oudTu5xs4nPvABEDcyruaX13W1BLh z5iUYq8GfrJq2vR71iQ34Ma15cDAPg/mXcCdR66bTpLghXgjg+VxUdyOzoovc53N3/eN iBHWcOfuKUXos5RE4LRFKypWUnMefoxAidH6EC5tdr7M5+TLTpK5TwPHccctCebu0za1 Lozv+IXHtL4spdyAz07PZaPXCWBeYdekcpvPoxg2zijjxU4z+kWrecwq9h0VrR/i2txs GQxQ== X-Gm-Message-State: ALoCoQnaTCgdqo4s0ogZIYPeeJxuSnrBeX1jWTJEjx/j1l1yIdK5zwBONjNP4VezAKfXthWbtSQf X-Received: by 10.195.11.101 with SMTP id eh5mr2793430wjd.59.1443604158728; Wed, 30 Sep 2015 02:09:18 -0700 (PDT) Received: from localhost (ip-31.net-81-220-164.nice.rev.numericable.fr. [81.220.164.31]) by smtp.gmail.com with ESMTPSA id ki7sm117345wjc.28.2015.09.30.02.09.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Sep 2015 02:09:18 -0700 (PDT) From: Baptiste Reynal To: kvmarm@lists.cs.columbia.edu, iommu@lists.linux-foundation.org, alex.williamson@redhat.com, christoffer.dall@linaro.org, eric.auger@linaro.org Cc: tech@virtualopensystems.com, kvm@vger.kernel.org (open list:VFIO PLATFORM DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [RFC PATCH v5 2/3] vfio: platform: access device property as a list of strings Date: Wed, 30 Sep 2015 11:09:06 +0200 Message-Id: <1443604149-3242-2-git-send-email-b.reynal@virtualopensystems.com> X-Mailer: git-send-email 2.6.0 In-Reply-To: <1443604149-3242-1-git-send-email-b.reynal@virtualopensystems.com> References: <1443604149-3242-1-git-send-email-b.reynal@virtualopensystems.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Antonios Motakis Certain device properties (e.g. the device node name, the compatible string), are available as a list of strings (separated by the null terminating character). Let the VFIO user query this type of properties. Signed-off-by: Antonios Motakis Signed-off-by: Baptiste Reynal --- v4 -> v5: - return ENOSPC when the buffer size is too small - remove strlen call v3 -> v4: - The list length is computed before strings copy. If the entire list doesn't fit, no strings are copied to the user. --- drivers/vfio/platform/properties.c | 43 +++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/vfio/platform/properties.c b/drivers/vfio/platform/properties.c index 48c90c5..212755f 100644 --- a/drivers/vfio/platform/properties.c +++ b/drivers/vfio/platform/properties.c @@ -22,7 +22,48 @@ static int dev_property_get_strings(struct device *dev, char *name, unsigned *lenp, void __user *datap, unsigned long datasz) { - return -EINVAL; + const char **val; + int n, i, ret; + + if (lenp == NULL) + return -EFAULT; + + *lenp = 0; + + n = device_property_read_string_array(dev, name, NULL, 0); + if (n < 0) + return n; + + val = kcalloc(n, sizeof(char *), GFP_KERNEL); + if (!val) + return -ENOMEM; + + ret = device_property_read_string_array(dev, name, val, n); + if (ret < 0) + goto out; + + for (i = 0; i < n; i++) + *lenp += strlen(val[i]) + 1; + + if (datasz < *lenp) { + ret = -ENOSPC; + goto out; + } + + for (i = 0; i < n; i++) { + size_t len = strlen(val[i]) + 1; + + if (copy_to_user(datap, val[i], len)) { + ret = -EFAULT; + goto out; + } + + datap += len; + } + +out: + kfree(val); + return ret; } static int dev_property_get_uint(struct device *dev,