From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753848AbbLVAJR (ORCPT ); Mon, 21 Dec 2015 19:09:17 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33009 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752158AbbLUXsA (ORCPT ); Mon, 21 Dec 2015 18:48:00 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 16/83] user_namespace: get rid of pointless casts Date: Mon, 21 Dec 2015 23:46:49 +0000 Message-Id: <1450741676-5865-16-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- kernel/user_namespace.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index b01948c..badce97 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -602,8 +602,7 @@ static ssize_t map_write(struct file *file, const char __user *buf, struct uid_gid_map new_map; unsigned idx; struct uid_gid_extent *extent = NULL; - unsigned long page = 0; - char *kbuf, *pos, *next_line; + char *kbuf = NULL, *pos, *next_line; ssize_t ret = -EINVAL; /* @@ -640,9 +639,8 @@ static ssize_t map_write(struct file *file, const char __user *buf, /* Get a buffer */ ret = -ENOMEM; - page = __get_free_page(GFP_TEMPORARY); - kbuf = (char *) page; - if (!page) + kbuf = (char *)__get_free_page(GFP_TEMPORARY); + if (!kbuf) goto out; /* Only allow < page size writes at the beginning of the file */ @@ -756,8 +754,7 @@ static ssize_t map_write(struct file *file, const char __user *buf, ret = count; out: mutex_unlock(&userns_state_mutex); - if (page) - free_page((void *)page); + free_page(kbuf); return ret; } -- 2.1.4