Messages in this thread | | | Date | Thu, 25 Jul 2013 09:39:52 +0200 | From | Michal Hocko <> | Subject | Re: [PATCH staging] zcache: fix "zcache=" kernel parameter |
| |
On Wed 24-07-13 19:04:14, Bartlomiej Zolnierkiewicz wrote: > From: Piotr Sarna <p.sarna@partner.samsung.com> > Subject: [PATCH] zcache: fix "zcache=" kernel parameter > > Commit 835f2f5 ("staging: zcache: enable zcache to be built/loaded as > a module") introduced an incorrect handling of "zcache=" parameter. > > Inside zcache_comp_init() function, zcache_comp_name variable is > checked for being empty. If not empty, the above variable is tested > for being compatible with Crypto API. Unfortunately, after that > function ends unconditionally (by the "goto out" directive) and returns: > - non-zero value if verification succeeded, wrongly indicating an error > - zero value if verification failed, falsely informing that function > zcache_comp_init() ended properly. > > A solution to this problem is as following: > 1. Move the "goto out" directive inside the "if (!ret)" statement > 2. In case that crypto_has_comp() returned 0, change the value of ret > to non-zero before "goto out" to indicate an error. > > This patch replaces an earlier one from Michal Hocko (based on report > from Cristian Rodríguez): > > http://permalink.gmane.org/gmane.linux.kernel.mm/102484 > > It also addressed the same issue but didn't fix the zcache_comp_init() > for case when the compressor data passed to "zcache=" option was invalid > or unsupported. > > Signed-off-by: Piotr Sarna <p.sarna@partner.samsung.com> > [bzolnier: updated patch description] > Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > Cc: Cristian Rodríguez <crrodriguez@opensuse.org> > Cc: Michal Hocko <mhocko@suse.cz> > Cc: Bob Liu <bob.liu@oracle.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Thanks!
> --- > drivers/staging/zcache/zcache-main.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c > index dcceed2..81972fa 100644 > --- a/drivers/staging/zcache/zcache-main.c > +++ b/drivers/staging/zcache/zcache-main.c > @@ -1811,10 +1811,12 @@ static int zcache_comp_init(void) > #else > if (*zcache_comp_name != '\0') { > ret = crypto_has_comp(zcache_comp_name, 0, 0); > - if (!ret) > + if (!ret) { > pr_info("zcache: %s not supported\n", > zcache_comp_name); > - goto out; > + ret = 1; > + goto out; > + } > } > if (!ret) > strcpy(zcache_comp_name, "lzo"); > -- > 1.7.9.5 > > >
-- Michal Hocko SUSE Labs -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |