* [PATCH 2/3] Fix logging for obex-client
2010-12-07 15:00 [PATCH 1/3] Fix possible crash when processing session callback Luiz Augusto von Dentz
@ 2010-12-07 15:01 ` Luiz Augusto von Dentz
2010-12-07 15:01 ` [PATCH 3/3] Add support for stat files bigger than 2GB on 32-bit systems Luiz Augusto von Dentz
2010-12-07 21:17 ` [PATCH 1/3] Fix possible crash when processing session callback Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2010-12-07 15:01 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
Since obex-client and obexd share the same log code they both were using
obexd for openlog which makes it very confusing when reading the logs.
To fix this now __obex_log_init takes the binary name so that each daemon
can be properly labeled.
---
client/main.c | 2 +-
src/log.c | 6 +++---
src/log.h | 2 +-
src/main.c | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/client/main.c b/client/main.c
index 74db15e..20d56d2 100644
--- a/client/main.c
+++ b/client/main.c
@@ -613,7 +613,7 @@ int main(int argc, char *argv[])
event_loop = g_main_loop_new(NULL, FALSE);
- __obex_log_init(option_debug, !option_stderr);
+ __obex_log_init("obex-client", option_debug, !option_stderr);
DBG("Entering main loop");
diff --git a/src/log.c b/src/log.c
index 39489a2..baa57c5 100644
--- a/src/log.c
+++ b/src/log.c
@@ -100,7 +100,7 @@ void __obex_log_enable_debug()
desc->flags |= OBEX_DEBUG_FLAG_PRINT;
}
-void __obex_log_init(const char *debug, int detach)
+void __obex_log_init(const char *label, const char *debug, int detach)
{
int option = LOG_NDELAY | LOG_PID;
struct obex_debug_desc *desc;
@@ -125,9 +125,9 @@ void __obex_log_init(const char *debug, int detach)
if (!detach)
option |= LOG_PERROR;
- openlog("obexd", option, LOG_DAEMON);
+ openlog(label, option, LOG_DAEMON);
- syslog(LOG_INFO, "OBEX daemon %s", VERSION);
+ syslog(LOG_INFO, "%s daemon %s", label, VERSION);
}
void __obex_log_cleanup(void)
diff --git a/src/log.h b/src/log.h
index 1bf1b05..e322565 100644
--- a/src/log.h
+++ b/src/log.h
@@ -26,7 +26,7 @@ void error(const char *format, ...) __attribute__((format(printf, 1, 2)));
void obex_debug(const char *format, ...) __attribute__((format(printf, 1, 2)));
-void __obex_log_init(const char *debug, int detach);
+void __obex_log_init(const char *label, const char *debug, int detach);
void __obex_log_cleanup(void);
void __obex_log_enable_debug(void);
diff --git a/src/main.c b/src/main.c
index 14e7d16..1e78615 100644
--- a/src/main.c
+++ b/src/main.c
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
- __obex_log_init(option_debug, option_detach);
+ __obex_log_init("obexd", option_debug, option_detach);
DBG("Entering main loop");
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 3/3] Add support for stat files bigger than 2GB on 32-bit systems
2010-12-07 15:00 [PATCH 1/3] Fix possible crash when processing session callback Luiz Augusto von Dentz
2010-12-07 15:01 ` [PATCH 2/3] Fix logging for obex-client Luiz Augusto von Dentz
@ 2010-12-07 15:01 ` Luiz Augusto von Dentz
2010-12-07 21:17 ` [PATCH 1/3] Fix possible crash when processing session callback Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Luiz Augusto von Dentz @ 2010-12-07 15:01 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.dentz-von@nokia.com>
>From stat documentation:
"(stat()) path refers to a file whose size cannot be represented in the
type off_t. This can occur when an application compiled on a 32-bit
platform without -D_FILE_OFFSET_BITS=64 calls stat() on a file whose size
exceeds (2<<31)-1 bits."
Note that this doesn't really help for files bigger than 4GB since obex
header field is 32-bits, but since folder-listing has no such limitation
it probably worth doing this anyway.
---
acinclude.m4 | 2 +-
client/transfer.c | 5 +++--
plugins/filesystem.c | 2 +-
src/obex-priv.h | 6 +++---
src/obex.c | 6 +++---
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 4594073..3d1f511 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AC_PROG_CC_PIE], [
AC_DEFUN([COMPILER_FLAGS], [
if (test "${CFLAGS}" = ""); then
- CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2"
+ CFLAGS="-Wall -O2 -D_FORTIFY_SOURCE=2 -D_FILE_OFFSET_BITS=64"
fi
if (test "$USE_MAINTAINER_MODE" = "yes"); then
CFLAGS+=" -Werror -Wextra"
diff --git a/client/transfer.c b/client/transfer.c
index 6eec513..daab4dc 100644
--- a/client/transfer.c
+++ b/client/transfer.c
@@ -470,7 +470,7 @@ int transfer_put(struct transfer_data *transfer, transfer_callback_t func,
struct session_data *session = transfer->session;
gw_obex_xfer_cb_t cb;
struct stat st;
- int fd;
+ int fd, size;
if (transfer->xfer != NULL)
return -EALREADY;
@@ -497,8 +497,9 @@ int transfer_put(struct transfer_data *transfer, transfer_callback_t func,
cb = put_xfer_progress;
done:
+ size = transfer->size < G_MAXUINT32 ? transfer->size : 0;
transfer->xfer = gw_obex_put_async(session->obex, transfer->name,
- transfer->type, transfer->size,
+ transfer->type, size,
-1, NULL);
if (transfer->xfer == NULL)
return -ENOTCONN;
diff --git a/plugins/filesystem.c b/plugins/filesystem.c
index bb758ab..0386c92 100644
--- a/plugins/filesystem.c
+++ b/plugins/filesystem.c
@@ -66,7 +66,7 @@
#define FL_PARENT_FOLDER_ELEMENT "<parent-folder/>" EOL_CHARS
-#define FL_FILE_ELEMENT "<file name=\"%s\" size=\"%lu\"" \
+#define FL_FILE_ELEMENT "<file name=\"%s\" size=\"%llu\"" \
" %s accessed=\"%s\" " \
"modified=\"%s\" created=\"%s\"/>" EOL_CHARS
diff --git a/src/obex-priv.h b/src/obex-priv.h
index c9be1c5..0806a56 100644
--- a/src/obex-priv.h
+++ b/src/obex-priv.h
@@ -33,9 +33,9 @@ struct obex_session {
char *path;
time_t time;
uint8_t *buf;
- int32_t pending;
- int32_t offset;
- int32_t size;
+ int64_t pending;
+ int64_t offset;
+ int64_t size;
void *object;
gboolean aborted;
struct obex_service_driver *service;
diff --git a/src/obex.c b/src/obex.c
index 6d4430d..99bfecc 100644
--- a/src/obex.c
+++ b/src/obex.c
@@ -590,7 +590,7 @@ static int obex_read_stream(struct obex_session *os, obex_t *obex,
/* only write if both object and driver are valid */
if (os->object == NULL || os->driver == NULL) {
- DBG("Stored %u bytes into temporary buffer", os->pending);
+ DBG("Stored %llu bytes into temporary buffer", os->pending);
return 0;
}
@@ -796,7 +796,7 @@ static void cmd_get(struct obex_session *os, obex_t *obex, obex_object_t *obj)
if (err < 0)
goto done;
- if (os->size != OBJECT_SIZE_UNKNOWN) {
+ if (os->size != OBJECT_SIZE_UNKNOWN && os->size < G_MAXUINT32) {
hd.bq4 = os->size;
OBEX_ObjectAddHeader(obex, obj,
OBEX_HDR_LENGTH, hd, 4, 0);
@@ -1005,7 +1005,7 @@ static gboolean check_put(obex_t *obex, obex_object_t *obj)
case OBEX_HDR_LENGTH:
os->size = hd.bq4;
- DBG("OBEX_HDR_LENGTH: %d", os->size);
+ DBG("OBEX_HDR_LENGTH: %llu", os->size);
break;
case OBEX_HDR_TIME:
os->time = parse_iso8610((const char *) hd.bs, hlen);
--
1.7.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/3] Fix possible crash when processing session callback
2010-12-07 15:00 [PATCH 1/3] Fix possible crash when processing session callback Luiz Augusto von Dentz
2010-12-07 15:01 ` [PATCH 2/3] Fix logging for obex-client Luiz Augusto von Dentz
2010-12-07 15:01 ` [PATCH 3/3] Add support for stat files bigger than 2GB on 32-bit systems Luiz Augusto von Dentz
@ 2010-12-07 21:17 ` Johan Hedberg
2 siblings, 0 replies; 4+ messages in thread
From: Johan Hedberg @ 2010-12-07 21:17 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
On Tue, Dec 07, 2010, Luiz Augusto von Dentz wrote:
> If the callback removes the pending data it cause this:
>
> ==20639== Invalid read of size 4
> ==20639== at 0x80553E9: free_pending (session.c:112)
> ==20639== by 0x8056C83: session_request_reply (session.c:837)
> ==20639== by 0x412F7E0: ??? (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x411D975: ??? (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x4120B81: dbus_connection_dispatch (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x804C27F: message_dispatch (mainloop.c:80)
> ==20639== by 0x407EFCB: ??? (in /lib/libglib-2.0.so.0.2600.1)
> ==20639== by 0x407E854: g_main_context_dispatch (in /lib/libglib-2.0.so.0.2600.1)
> ==20639== by 0x4082667: ??? (in /lib/libglib-2.0.so.0.2600.1)
> ==20639== by 0x4082BA6: g_main_loop_run (in /lib/libglib-2.0.so.0.2600.1)
> ==20639== by 0x8055171: main (main.c:625)
> ==20639== Address 0x4363c88 is 0 bytes inside a block of size 12 free'd
> ==20639== at 0x40257ED: free (vg_replace_malloc.c:366)
> ==20639== by 0x4087485: g_free (in /lib/libglib-2.0.so.0.2600.1)
> ==20639== by 0x80553FE: free_pending (session.c:115)
> ==20639== by 0x805543C: agent_free (session.c:127)
> ==20639== by 0x80566A6: session_free (session.c:149)
> ==20639== by 0x8056BCA: session_terminate_transfer (session.c:914)
> ==20639== by 0x8056F61: session_prepare_put (session.c:1397)
> ==20639== by 0x8056C74: session_request_reply (session.c:835)
> ==20639== by 0x412F7E0: ??? (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x411D975: ??? (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x4120B81: dbus_connection_dispatch (in /lib/libdbus-1.so.3.5.2)
> ==20639== by 0x804C27F: message_dispatch (mainloop.c:80)
>
> To fix this agent->pending is now reset to NULL before calling the
> callback, so even if the session is terminated it won't cause a free to
> pending data, which is fine since it is latter freed on callback return.
> ---
> client/session.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
Patches 1 and 2 have been pushed. For the third one (as we discussed
offline) I'm still waiting for an update to fix the format string
specifier for off_t.
Johan
^ permalink raw reply [flat|nested] 4+ messages in thread