From: Serban Constantinescu <serban.constantinescu@arm.com>
To: gregkh@linuxfoundation.org, arve@android.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
john.stultz@linaro.org, ccross@android.com, Dave.Butcher@arm.com,
irogers@google.com, romlem@android.com
Cc: Serban Constantinescu <serban.constantinescu@arm.com>
Subject: [PATCH v1 4/9] staging: android: binder: Add align_helper() macro
Date: Wed, 4 Dec 2013 18:09:36 +0000 [thread overview]
Message-ID: <1386180581-6710-5-git-send-email-serban.constantinescu@arm.com> (raw)
In-Reply-To: <1386180581-6710-1-git-send-email-serban.constantinescu@arm.com>
This patch adds align_helper() macro that will be used for enforcing
the desired alignment on 64bit systems where the alignment will differ
depending on the userspace used (32bit /64bit).
This patch is a temporary patch that will be extended with 32bit compat
handling.
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
---
drivers/staging/android/binder.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 16109cd..6719a53 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -140,6 +140,8 @@ module_param_call(stop_on_user_error, binder_set_stop_on_user_error,
binder_stop_on_user_error = 2; \
} while (0)
+#define align_helper(ptr) ALIGN(ptr, sizeof(void *))
+
enum binder_stat_types {
BINDER_STAT_PROC,
BINDER_STAT_THREAD,
@@ -1239,7 +1241,7 @@ static void binder_transaction_buffer_release(struct binder_proc *proc,
if (buffer->target_node)
binder_dec_node(buffer->target_node, 1, 0);
- offp = (size_t *)(buffer->data + ALIGN(buffer->data_size, sizeof(void *)));
+ offp = (size_t *)(buffer->data + align_helper(buffer->data_size));
if (failed_at)
off_end = failed_at;
else
@@ -1472,7 +1474,7 @@ static void binder_transaction(struct binder_proc *proc,
if (target_node)
binder_inc_node(target_node, 1, 0, NULL);
- offp = (size_t *)(t->buffer->data + ALIGN(tr->data_size, sizeof(void *)));
+ offp = (size_t *)(t->buffer->data + align_helper(tr->data_size));
if (copy_from_user(t->buffer->data, tr->data.ptr.buffer, tr->data_size)) {
binder_user_error("%d:%d got transaction with invalid data ptr\n",
@@ -2378,8 +2380,7 @@ retry:
tr.data.ptr.buffer = (void *)t->buffer->data +
proc->user_buffer_offset;
tr.data.ptr.offsets = tr.data.ptr.buffer +
- ALIGN(t->buffer->data_size,
- sizeof(void *));
+ align_helper(t->buffer->data_size);
if (binder_copy_to_user(cmd, &tr, &ptr, sizeof(struct binder_transaction_data)))
return -EFAULT;
--
1.7.9.5
next prev parent reply other threads:[~2013-12-04 18:15 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 18:09 [PATCH v1 0/9] Android: Add Support for Binder Compat Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 1/9] staging: android: binder: Move some of the logic into subfunction Serban Constantinescu
2013-12-05 8:00 ` Dan Carpenter
2013-12-05 18:37 ` Serban Constantinescu
2013-12-05 8:18 ` Dan Carpenter
2013-12-05 15:31 ` Greg KH
2013-12-05 18:35 ` Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 2/9] staging: android: binder: Add binder_copy_to_user() Serban Constantinescu
2013-12-04 23:17 ` Greg KH
2013-12-05 18:44 ` Serban Constantinescu
2013-12-05 8:36 ` Dan Carpenter
2013-12-04 18:09 ` [PATCH v1 3/9] staging: android: binder: Add cmd == CMD_NAME handling Serban Constantinescu
2013-12-05 8:40 ` Dan Carpenter
2013-12-05 18:50 ` Serban Constantinescu
2013-12-04 18:09 ` Serban Constantinescu [this message]
2013-12-05 8:41 ` [PATCH v1 4/9] staging: android: binder: Add align_helper() macro Dan Carpenter
2013-12-04 18:09 ` [PATCH v1 5/9] staging: android: binder: Add deref_helper() macro Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 6/9] staging: android: binder: Add size_helper() macro Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 7/9] staging: android: binder: Add copy_flat_binder_object() Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 8/9] staging: android: binder: Add binder compat handling to binder.h Serban Constantinescu
2013-12-04 18:09 ` [PATCH v1 9/9] staging: android: binder: Add binder compat layer Serban Constantinescu
2013-12-04 18:35 ` Greg KH
2013-12-04 20:46 ` Colin Cross
2013-12-04 21:43 ` Greg KH
2013-12-04 21:55 ` Colin Cross
2013-12-04 22:02 ` Greg KH
2013-12-04 22:22 ` Colin Cross
2013-12-05 0:02 ` Greg KH
2013-12-05 0:21 ` Colin Cross
2013-12-05 2:02 ` Arve Hjønnevåg
2013-12-05 18:31 ` Serban Constantinescu
2013-12-05 18:49 ` Greg KH
2013-12-10 3:01 ` Octavian Purdila
2013-12-11 3:21 ` Arve Hjønnevåg
2013-12-11 18:10 ` Octavian Purdila
2013-12-11 23:00 ` Arve Hjønnevåg
2013-12-12 8:45 ` Octavian Purdila
2013-12-13 5:14 ` Arve Hjønnevåg
2013-12-13 7:39 ` Octavian Purdila
2013-12-04 23:21 ` One Thousand Gnomes
2013-12-04 23:40 ` Colin Cross
2013-12-05 0:32 ` One Thousand Gnomes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386180581-6710-5-git-send-email-serban.constantinescu@arm.com \
--to=serban.constantinescu@arm.com \
--cc=Dave.Butcher@arm.com \
--cc=arve@android.com \
--cc=ccross@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=irogers@google.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=romlem@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®