From patchwork Tue May 19 00:45:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6432841 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id F37F4C0432 for ; Tue, 19 May 2015 00:50:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 14FEC20431 for ; Tue, 19 May 2015 00:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 187DD2042C for ; Tue, 19 May 2015 00:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751946AbbESAtu (ORCPT ); Mon, 18 May 2015 20:49:50 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:32820 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138AbbESAts (ORCPT ); Mon, 18 May 2015 20:49:48 -0400 Received: by padbw4 with SMTP id bw4so173687422pad.0; Mon, 18 May 2015 17:49:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+TpLLehZaUU53FzoVb3hW2CK0lXXOfa7XJaViLZlvFc=; b=zanz3iWQpJDkPoFSrwX76xgc9yHQqsEq9RU7tx/uRC9QEG3r8iybVY5fTHftCcA1YI x8kIudnmfXaPfYBJlANndpv5CTR+ffK3dB5ID/NRTGW53tl7shwyjyJRoTwB+xiIq1Es 1QOBieUBNtXtogvnxxrhU924j5vwMO0jd91B986s3l3qFx4V5kTfxlOpndCsHPyBTRMN bkuDJ+ra10g8ec7gs5OWpmHVXdiX5XEaSKhMPXJlAcS4OlYGBAVmL0T9i0w20QxqyXP7 VhIWw01JAot1OnJmP5Fac4e1YroOS0W3cm0+Iz4KyL/6Ouejdj7zr0V7DutyHBNb/jbb VupQ== X-Received: by 10.68.242.41 with SMTP id wn9mr48099869pbc.117.1431996588287; Mon, 18 May 2015 17:49:48 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id k3sm11213416pde.18.2015.05.18.17.49.45 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 May 2015 17:49:47 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Mon, 18 May 2015 17:47:37 -0700 From: "Luis R. Rodriguez" To: ming.lei@canonical.com Cc: rusty@rustcorp.com.au, torvalds@linux-foundation.org, dhowells@redhat.com, seth.forshee@canonical.com, linux-kernel@vger.kernel.org, pebolle@tiscali.nl, linux-wireless@vger.kernel.org, gregkh@linuxfoundation.org, jlee@suse.com, tiwai@suse.de, casey@schaufler-ca.com, keescook@chromium.org, mjg59@srcf.ucam.org, akpm@linux-foundation.org, "Luis R. Rodriguez" , Kyle McMartin , David Woodhouse Subject: [RFC v3 1/2] firmware: generalize reading file contents as a helper Date: Mon, 18 May 2015 17:45:24 -0700 Message-Id: <1431996325-8840-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431996325-8840-1-git-send-email-mcgrof@do-not-panic.com> References: <1431996325-8840-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,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: "Luis R. Rodriguez" We'll want to reuse this same code later in order to read two separate types of file contents. Although we can simplify fw_read_file_contents() to do a direct return we leave a bit of boilerplate code to make the next changes easier to review. In this case we'll later extend the firmware specific read to also go and fetch the signature file when required. This commit introduces no functional changes. Cc: Rusty Russell Cc: David Howells Cc: Ming Lei Cc: Seth Forshee Cc: Kyle McMartin Cc: David Woodhouse Signed-off-by: Luis R. Rodriguez --- drivers/base/firmware_class.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 8c3aa3c..134dd77 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c @@ -291,7 +291,8 @@ static const char * const fw_path[] = { module_param_string(path, fw_path_para, sizeof(fw_path_para), 0644); MODULE_PARM_DESC(path, "customized firmware image search path with a higher priority than default path"); -static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) +static int __read_file_contents(struct file *file, + void **dest_buf, size_t *dest_size) { int size; char *buf; @@ -314,14 +315,30 @@ static int fw_read_file_contents(struct file *file, struct firmware_buf *fw_buf) rc = security_kernel_fw_from_file(file, buf, size); if (rc) goto fail; - fw_buf->data = buf; - fw_buf->size = size; + + *dest_buf = buf; + *dest_size = size; + return 0; fail: vfree(buf); return rc; } +static int fw_read_file_contents(struct file *file, + struct firmware_buf *fw_buf) +{ + int rc; + + rc = __read_file_contents(file, + &fw_buf->data, + &fw_buf->size); + if (rc) + return rc; + + return 0; +} + static int fw_get_filesystem_firmware(struct device *device, struct firmware_buf *buf) {