From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Subject: Re: [PATCH] libkmod: Handle long lines in /proc/modules To: Lucas De Marchi References: <1466172255-20955-1-git-send-email-mmarek@suse.com> <5767ECB7.8040203@suse.com> Cc: linux-modules From: Michal Marek Message-ID: <576803BA.8030801@suse.com> Date: Mon, 20 Jun 2016 16:54:50 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 List-ID: On 2016-06-20 15:41, Lucas De Marchi wrote: > On Mon, Jun 20, 2016 at 10:16 AM, Michal Marek wrote: >> On 2016-06-20 14:55, Lucas De Marchi wrote: >>> On Fri, Jun 17, 2016 at 11:04 AM, Michal Marek wrote: >>>> Also, the buffer could be shrinked now, so that we do not use that much >>>> space on stack. Not sure if this is of interest or not. I left it as is. >>> >>> Yep, I think it's reasonable to be 64 bytes since it's the maximum >>> length of a module name >> >> OK. In kmod_module_get_size(), the buffer needs to be larger, though. >> >> >>>> diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c >>>> index 1460c6746cc4..25dcda7667b7 100644 >>>> --- a/libkmod/libkmod-module.c >>>> +++ b/libkmod/libkmod-module.c >>>> @@ -1660,13 +1660,14 @@ KMOD_EXPORT int kmod_module_new_from_loaded(struct kmod_ctx *ctx, >>>> struct kmod_module *m; >>>> struct kmod_list *node; >>>> int err; >>>> + size_t len = strlen(line); >>>> char *saveptr, *name = strtok_r(line, " \t", &saveptr); >>>> >>>> err = kmod_module_new_from_name(ctx, name, &m); >>>> if (err < 0) { >>>> ERR(ctx, "could not get module from name '%s': %s\n", >>>> name, strerror(-err)); >>>> - continue; >>>> + goto eat_line; >>> >>> I think it would be better to "eat line" before anything else, above >>> kmod_module_new_from_name(). So you don't need to change the flow >>> here. >> >> Sure, but then we would need two buffers, because name is a pointer into >> line. > > oh, right. Thinking again, I'm ok with your version. Shall I post a version that reduces the size of the buffer, or are you going to apply my patch as is? Thanks, Michal